Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:43:27 +0000 (12:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:43:27 +0000 (12:43 -0500)
commit2a33611c5802fbb688ad877531a947516e4430c9
tree7a067b05c055ad32592fec80daeb281a171ea5d6
parent1db5afc1da1d43b90bbfdfc9cf91fe79f4f3e067
parentb3019ab077138bde61719ab216525eb2715b7abf
Merge branch 'hotfix/1.0.12'