Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:53:39 +0000 (09:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:53:39 +0000 (09:53 -0400)
commit1313b30cb81ff6ea6ea0e848dd2ceb24b4126154
treeea94a72d95745fc5b48116b4ea47049f97489a15
parentc95fe25468f55cd766342a33d49a6985ef0b9170
parent9d235a174b8a420d19471cabcf8c7d56e39959fd
Merge branch 'hotfix/1.0.18'