Merge branch 'hotfix/1.0.42' v1.0.42
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 16:05:53 +0000 (12:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 12 Jul 2016 16:05:53 +0000 (12:05 -0400)
commit9a64eba3c81fd859e2781ce1bf1e823dbceca4da
treec1fbcc89f4eb16e96ba193d0f64bbbf42381b259
parent2b363ace7e1dffeb43a3386952880de034760ad7
parent9a5f07edf8e1941a49974eb72680afc0967a7b94
Merge branch 'hotfix/1.0.42'