Merge tag 'v1.2.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jun 2015 15:31:04 +0000 (11:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jun 2015 15:31:04 +0000 (11:31 -0400)
commit481c068f0fc43b01b86732441909982f73509c11
tree42104ca29ae8bd5652e426b7f081bc3fdf783562
parent1dbd0425be2755e8f0b8973590c44241c8081731
parent867377a5e330ee9de2eb54b592322dcc59ad2ffb
Merge tag 'v1.2.0' into develop

v1.2.0