Merge branch 'hotfix/1.1.12' V1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:14:34 +0000 (11:14 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:14:34 +0000 (11:14 -0500)
commit725a8cfacc91247d9be9cbbcf83d2f1369003390
tree99c5b3f4e2985929bf1a456dfe85906c2eea5a00
parent9cc8bd8902e14156a52e0b3becc46ad24630071d
parentdd7a972d11c57d9970d1885f5baa72d610f86ab0
Merge branch 'hotfix/1.1.12'