Merge branch 'hotfix/1.0.4'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jan 2016 19:00:13 +0000 (14:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jan 2016 19:00:13 +0000 (14:00 -0500)
commiteb9690c30f12be444c802a4e164756fe148c48d7
tree4b44a31afadf9eb369d0f7103f28dfe779ec9ad0
parent900896878669c86fe223bdaa9d070f737ecf44e7
parent8626424a1f0b5f41ea43d2f832df0d5fc05f8bde
Merge branch 'hotfix/1.0.4'