Merge branch 'hotfix/1.3.4' v1.3.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Sep 2016 15:32:31 +0000 (11:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Sep 2016 15:32:31 +0000 (11:32 -0400)
commitdc67af367dc286c10c33f2b565ab8855124a8ea8
tree20b42e23c68eb962d2e9e02f73cf937ab9536d69
parent7496691bf8b6ad8cc1ee7b2c3853fd0e825426e5
parentb901d58dfb1d30250d26e9ef01f61ee5e18fda34
Merge branch 'hotfix/1.3.4'