Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 17:59:13 +0000 (12:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 17:59:13 +0000 (12:59 -0500)
commit39d332d681bad60b6ddeb85716113a16cf11f0d5
treea5a9d959068d911b363c8a4e856cea849efb792b
parentde6247662f9cb69eb7aedf3a9a343a767cbc6f85
parent7fd6cc43ef0f03b70369c7eec3cad773a1cfa593
Merge branch 'hotfix/1.0.7'