Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 18:51:41 +0000 (14:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 18:51:41 +0000 (14:51 -0400)
commit9f85945bcc2b2433aecadc2d2e919be4d6f228ed
treee20b0bf7380bf96eeb0d42ae300e7159eeb43da2
parentf941c8945f86d97fd16779c5cf17c0d9f611d7fb
parent1e286692ea3d90b2ff9700c39314eb044404192c
Merge tag 'v1.0.4' into develop

v1.0.4