Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 15:57:07 +0000 (11:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 15:57:07 +0000 (11:57 -0400)
commit47b5aed4fd718a659ebe52f9ca8e374e62e757ff
tree4daaa09220e2b58c23f6f657d34f664646f16bba
parentfba53801aaf1f55c56568e264ad6df112ac023e0
parent0b04864b4fa5f4872c8739bde31900534bc2af74
Merge tag 'v1.0.12' into develop

v1.0.12