Merge tag 'v1.0.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:57:49 +0000 (10:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Feb 2016 15:57:49 +0000 (10:57 -0500)
commitf62393da5131c6201dfcc12081fa6b791ccdb142
tree38fac9ed0ef09f9e8ea807a084575cb9abbd0aaa
parent7cf5c3cf784962bbc635af21cea9ad4ac8d08a19
parentd07176f0c90ad2d9760a67de24da4dc6916e4a44
Merge tag 'v1.0.12' into develop

v1.0.12