Merge branch 'hotfix/1.3.5'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Jul 2015 13:56:44 +0000 (09:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Jul 2015 13:56:44 +0000 (09:56 -0400)
commit59d5594b87316e87f30de0f93be7ac383c42f1e5
tree840a3d3ab8fe086e1a936818a5133e3f6c8ef89f
parent56d87707112e6064490f6afb73e229c1e2e04b4a
parent1fb0e1be5346e7dc901f852082f4dc7a1cd76fb5
Merge branch 'hotfix/1.3.5'