Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:43:47 +0000 (11:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:43:47 +0000 (11:43 -0500)
commitebf406683b9533d0b41f0af43ba0cb85f1997fa0
tree671f142819df31d4f2d73f713f166c508fb11226
parent5f03c9f33a60f0b1dfe56dfdfc2687016652bb89
parent9f2b417d7d0959a102084270d2ea629108494538
Merge branch 'hotfix/1.0.18'