Merge branch 'hotfix/1.0.6' v1.0.6
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Sep 2015 16:35:33 +0000 (12:35 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Sep 2015 16:35:33 +0000 (12:35 -0400)
commit47ae49ee3c155df5f89dad46ef3165eae8901ca9
tree1b592f5b0f676152200f8b0a602c1089d9cc7ce1
parent5d92f719c20628483518a08a00ee53b12c473c7b
parentbba6bb04dc85034c870364e682c6d3bc9f7011e7
Merge branch 'hotfix/1.0.6'