Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:36:44 +0000 (10:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:36:44 +0000 (10:36 -0400)
commit4b7fe5199b0e3da00e0b41f18c87864c1e53aece
tree5b31125189306cf46360c72c67de8fa5036e2fa4
parente049b2824988855280a36a3edb37ba9dba09e9fb
parent041a8e163664b5f9c9c27a5981cd41330a18f067
Merge branch 'hotfix/1.0.4'