Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:45:58 +0000 (12:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:45:58 +0000 (12:45 -0400)
commit8bccdc18d4a1386e799cd98a2b907dd9f9bf6507
tree03d3a5b4a0775b6e5cb096b4e2a14d3f6636c0af
parentaf3dbd2bd6c31b707ec2965f7d9b7a822da378a9
parentae471605f8f79d3e12aa81f91bd5c48feaa07d15
Merge branch 'hotfix/1.0.7'