Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 14:24:16 +0000 (10:24 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 14:24:16 +0000 (10:24 -0400)
commitc89fe0da859235597e06808e3b5ae68f6bb83d0b
treecb9ac1bf7a8eae6eefb933276a2282037f3698a0
parentcafe2c79c3bc03e1dba7776f48a12858e5e024d9
parenta65a4ed4652dcf02902431289086efc84fc7aaf5
Merge branch 'hotfix/1.0.12'