Merge branch 'hotfix/1.2.29' v1.2.29
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Aug 2016 12:25:02 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Aug 2016 12:25:02 +0000 (08:25 -0400)
commit725c4b33da38a0ccec7cad5de608ce20caccd0d0
tree2b3742385bb2d05186956e9a42ad517600f49466
parentdbda11e42982215bb63fe3c25f026e69d8296b3b
parentd55edf456b1e6d6b4cc793379e635d765cb883ec
Merge branch 'hotfix/1.2.29'