Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Dec 2016 18:56:59 +0000 (13:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Dec 2016 18:56:59 +0000 (13:56 -0500)
commit77392aadc02ad8c48ec15e0842693c9842fe9d89
treeb471d80742022d1586b003587169aa6cc68c98b9
parentc104bed67f0df3bf50c65d1502dca4ca30d072c8
parent59157d2edf219e57c470e5db1f793e387c9c9e69
Merge branch 'hotfix/1.0.6'