Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 18:10:48 +0000 (14:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 18:10:48 +0000 (14:10 -0400)
commitc5812dbd93ea67382de4221c28e48e7f8ec2e0d5
treefdde86df6844ee1fcf63fae96c81cc118f7aabf6
parent4f673cba854bc2a2320d7ecef0cb91828852dd13
parentdb79c0dc073a283eb8d826950e3b95b0c7c5df17
Merge branch 'hotfix/1.0.5'