Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:14:10 +0000 (17:14 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:14:10 +0000 (17:14 -0500)
commit3707972d0307f7765b520d5b055ad2f41fbf616f
treefe3ab361223bdcec73ce6eb8a10fa1bbb4114c1c
parent4c0c9379a2dca305b95845daf8871f11a7aed6a7
parentd9a9c3245adf4af251b6156a9bb23d9f39fbbae1
Merge branch 'hotfix/1.0.4'