Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 19:29:26 +0000 (14:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 19:29:26 +0000 (14:29 -0500)
commit301caac014d8ac424b94d79e1cd7b9d7d80de224
treee673f6fe6f2ee2bc74192f10e70cebb003da7c27
parente693a9dc8ea36c2fa48e08d171ea46a1dac63228
parent369952db887a38bc853427b252b3296527edf473
Merge branch 'hotfix/1.0.18'