Merge branch 'hotfix/1.0.7' v1.0.7
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:12:10 +0000 (15:12 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:12:10 +0000 (15:12 -0500)
commit463edd4013c05cb3c5d11639d2a322f13449d1d3
tree4c1c30d89df414205ac1047df9ac7655956997c1
parentae637e2349e13c4640da8c9d6f984d476e0fae06
parent94e803b8e99004b072606ba12df4ae299729e962
Merge branch 'hotfix/1.0.7'