Merge branch 'hotfix/1.1.2' v1.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 15:27:22 +0000 (10:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 15:27:22 +0000 (10:27 -0500)
commit40ca5368d865c7b2b6f4cfa996e245a6a9ddf000
treec3568dd6758e6d6407c73eeadc2410840290e8b3
parentd753fa8fc1f8713ce8e7aea1bdd1f79d39a3e22e
parente1633b72110bb0c90abca8507243fb8932c592c1
Merge branch 'hotfix/1.1.2'