Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:57:44 +0000 (10:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:57:44 +0000 (10:57 -0500)
commitd07176f0c90ad2d9760a67de24da4dc6916e4a44
tree38fac9ed0ef09f9e8ea807a084575cb9abbd0aaa
parentdf25cb5874e667daec623b1175dc25a23ac4f12e
parent6ce65bb8c3bfa8995db52c1229a19d990e22ad11
Merge branch 'hotfix/1.0.12'