Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 14:29:05 +0000 (10:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 14:29:05 +0000 (10:29 -0400)
commit7a2002071e0115c5c49ee690f46af362b92faa2e
treef60b2e87fbc5fc6aed50ca87b2021d1f42f72e37
parentfcba2e9dbf80119b7502c0aed61c807f6171a2ed
parentd6c3c9fb97d5287a1d5971b18a56942dd38da9d4
Merge branch 'hotfix/1.0.4'