Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jan 2016 19:00:18 +0000 (14:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jan 2016 19:00:18 +0000 (14:00 -0500)
commit790ae3ac5707674e77911c63fdbd68d4c2aaaac7
tree4b44a31afadf9eb369d0f7103f28dfe779ec9ad0
parent86ff383acc489199bf2e9cc78ad6347b175d5829
parenteb9690c30f12be444c802a4e164756fe148c48d7
Merge tag 'v1.0.4' into develop

v1.0.4