Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Jul 2016 13:39:07 +0000 (09:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Jul 2016 13:39:07 +0000 (09:39 -0400)
commit4a748758ff11f62cca69637e5d96d415be4f4449
tree212d888275a9bd3938befbd5a91f8acadc0fd120
parent50d1abb802eda73d23cc5def19fac1d14ed0e80b
parent26f3d4e6a0de0bbc03a0920606a3a9f7e4ea4eae
Merge branch 'hotfix/1.0.5'