Merge branch 'hotfix/1.0.6' v1.0.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 20:30:11 +0000 (16:30 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 20:30:11 +0000 (16:30 -0400)
commit805e1cd23b8a5e6134365824fe2d8b952743dee4
treee91d6077a802661928228e96f963a26a5a75087a
parent33b10a36fbaabd890feb5f80c648bdd0bbe236e0
parent8d9003f460fa97612db5f8e766a8eab85c3fc9ae
Merge branch 'hotfix/1.0.6'