Merge branch 'hotfix/1.5.3' v1.5.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 3 Nov 2016 17:58:20 +0000 (13:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 3 Nov 2016 17:58:20 +0000 (13:58 -0400)
commit43ae5e4e0238c6fe00b756cba2fe9c11d085eec1
tree1b13ac37c3950efe00d826d9e377421515f42c30
parentccfa38ae3bd7495a7eb12aaff44fa079ef20e97a
parent5fb85a680eb39c06685600128b246b1538f387ec
Merge branch 'hotfix/1.5.3'