Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 21:06:13 +0000 (16:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 21:06:13 +0000 (16:06 -0500)
commit6fd2f53f397a165623dadd6c6fac561a221504d9
treec6b82c2be3926c99489643015485456e93fb9fa6
parentef2ab5867b8703a2cad7f9fdae4914cf63c9a58f
parent072459bbd5b6921c81014b9af1c6319d44845f83
Merge branch 'hotfix/1.0.12'