Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:53:31 +0000 (12:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:53:31 +0000 (12:53 -0400)
commit5c35aee0d69eb8bd0803dae53b25af4698d7df85
tree201e9adf891a3af84e21a15821d21a0551476c71
parente313ddc66ba9de3b7e0179acf098c91c8db8f17f
parentd5bd65178323fb94b0d745fbae1295562c653b0b
Merge branch 'hotfix/1.0.5'