Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:38:39 +0000 (14:38 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:38:39 +0000 (14:38 -0500)
commitab1874f3c47d3f565276ebe9b3db76b2646a96ec
treeba2a88e91c3cc69212439c467411aa7b3bac6671
parentd537c7408dbf5764286b0206581b0a71b131e70e
parente877c1e5f619d54c8cd798b595eddbd965c6f2e9
Merge branch 'hotfix/1.0.5'