Merge branch 'hotfix/1.0.17'
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 19:32:11 +0000 (15:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 19:32:11 +0000 (15:32 -0400)
commit46d39d49e115a207474faed53adc9579a9543da5
tree2372b7bab24f221b8dfdc74fa4ad6bb380231836
parentae04cd30a9ed443bda03bab7dcec18f7b15d40b4
parent639e8f63cabfb936534475152e3f1f132d4c45d8
Merge branch 'hotfix/1.0.17'