Merge branch 'hotfix/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 14:02:47 +0000 (09:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 14:02:47 +0000 (09:02 -0500)
commit9a5e7d1149c0636d62ef4cec4d8637eb6ecc28c0
treee5645a847f306db4fa85cd6519e4d99e524c2d20
parentd1e6481cf26704a5cee0041d21f13167021a903a
parent8e7b1983068367e8e465b0ca7e0c90be64cde517
Merge branch 'hotfix/1.0.12'