Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:33:32 +0000 (16:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:33:32 +0000 (16:33 -0400)
commit46f5729616573920dad1822824518a2d61b12401
treef3ebc6a30180241771dd2ff678ef3ff1920c3d22
parent573678da3a9c6bee4da00b560308343b434e9a86
parent216c9d7c21591d3438aca49a98a7ecbb1b1fff97
Merge branch 'hotfix/1.0.12'