Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 18:19:57 +0000 (13:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 18:19:57 +0000 (13:19 -0500)
commitc104bed67f0df3bf50c65d1502dca4ca30d072c8
tree25f392c88c77319022db54a937da9e8bce70b857
parent273d6991d8b284481e406e2614198366dbab7a48
parent3249032421f316d3b12893a45834df3c28901415
Merge branch 'hotfix/1.0.5'