Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 18:35:59 +0000 (14:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 18:35:59 +0000 (14:35 -0400)
commit34f1db11440c8247106145502f8f87a79987aa46
treeb69616691b11e4dbd782bb76401ac2afd238767f
parent2a30e9b74a830444a2fe557d72ffaa1f14d95667
parent3e9720b9de66f40538a0edcbd787a764ea14e14e
Merge branch 'hotfix/1.0.2'