Merge branch 'hotfix/1.1.12'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:57:03 +0000 (16:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:57:03 +0000 (16:57 -0400)
commit172347aae83acafc97928a088769336914aca446
treed0b77bdccf4961327af83fb575d4a8ca0a3cf27b
parent4c76229be210ae6037a9f22d6bf6bc23d903e604
parent42c12280b8e91e4232f36af4bf0a56dd8edc4f6d
Merge branch 'hotfix/1.1.12'