Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:42:16 +0000 (14:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 18:42:16 +0000 (14:42 -0400)
commitedb348e8e2ecfc791244b92b71caf3eec1471c07
tree0c1dedb1d6a9fec455c16c7669f4002892156a50
parentc1fb21e097c704a49bb369995f6cae1d2a38d191
parentfbc5385672e5440679e0f5fc516dcad6f197f50e
Merge tag 'v1.0.12' into develop

v1.0.12