Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 19:24:55 +0000 (14:24 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 19:24:55 +0000 (14:24 -0500)
commit44252453644ad18f2a1e7c5ba972c9c98c174df0
treefa5a96ac6d42a4556ca0b65cc81b92535e6f2507
parentdd84caa4ef531985b7c060ad6e173ed4d279875b
parentdb71c0afa7f5b6ffaa887cfea1e53e9e173906b3
Merge branch 'hotfix/1.0.4'