Merge branch 'hotfix/1.0.35' v1.0.35
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:07:32 +0000 (11:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:07:32 +0000 (11:07 -0500)
commitbe103e24c489188010de9497efa84243914789c4
treefed3935312c1892fd5bf4092b967522319e69297
parentb7044fb747dfa999ace91fa1fc1eabbd7bdeb6be
parent9a881d27bbab0f2a12a07ca33e96f5a43cb01c07
Merge branch 'hotfix/1.0.35'