Merge branch 'hotfix/0.3.7' v0.3.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jan 2016 18:50:44 +0000 (13:50 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jan 2016 18:50:44 +0000 (13:50 -0500)
commit410026d94544b26b06973599180733fb19c9221c
treee23f5ac9ec5e33d0e82405ac69ba8274581c2b70
parent6ce11ea6f0c39d4b2da1a0947e9b92cd181fab63
parent528ab1e68c4335a43d576a46977e631f27799f7f
Merge branch 'hotfix/0.3.7'