Merge branch 'hotfix/1.2.0' v1.2.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jun 2015 15:30:58 +0000 (11:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jun 2015 15:30:58 +0000 (11:30 -0400)
commit867377a5e330ee9de2eb54b592322dcc59ad2ffb
tree42104ca29ae8bd5652e426b7f081bc3fdf783562
parentf75952cad6c523769be0e66e015200801721d10d
parent249b27e5bd67a6883b17b819bfba6e2680951deb
Merge branch 'hotfix/1.2.0'