Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:56:19 +0000 (14:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:56:19 +0000 (14:56 -0400)
commite4fde860fbf59f3c82d73fc9e7dcad028c2c2218
treeedd561f55305b8a6fd1ad9cb07892123fe9c977e
parent9075a5f5ba927ccbea2fbf84be5af71aef23408c
parent2732048b6b31c66d5b2020cb72e4c59c4e1b614c
Merge branch 'hotfix/1.0.4'