Merge branch 'hotfix/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Nov 2015 21:39:21 +0000 (16:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Nov 2015 21:39:21 +0000 (16:39 -0500)
commit5b74de004361a29b488417baff3a8edb654519fb
tree0d8bd02c2669f2e7a7d1a9de1e58cd428db9014a
parent4d0a65248998ac5bf721b7bdd87b4cdfa4f90b58
parentfcf522e06e45038f79c0ef2f6b93fdfe203c2e10
Merge branch 'hotfix/1.0.17'