Merge tag 'v1.2.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:32:48 +0000 (13:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:32:48 +0000 (13:32 -0400)
commit47cc272ab2c46558f98f04ce8326732cd80dea40
tree8027e238aba0114c45bd1479091b57bcaf7037fa
parent481c068f0fc43b01b86732441909982f73509c11
parentbbe05c56e75981ea573b6a09c3541b1ee6b6ca77
Merge tag 'v1.2.1' into develop

v1.2.1