Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 18:51:36 +0000 (14:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 18:51:36 +0000 (14:51 -0400)
commit1e286692ea3d90b2ff9700c39314eb044404192c
treee20b0bf7380bf96eeb0d42ae300e7159eeb43da2
parent9a336be66251530bbd27f74f9e43f198c6b80125
parent41234e61fd96e2769279839a9185d349e65b2b24
Merge branch 'hotfix/1.0.4'