Merge branch 'hotfix/2.0.4' v2.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 18:46:47 +0000 (14:46 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 18:46:47 +0000 (14:46 -0400)
commitaefc51b25c4ac90f682c298e3e894b4858b397ba
treee3dec9095c04d19daa3953b3bc52a48ba0dbfc12
parentd0c53930bcfef6748c656c0b45645356d57e9b1a
parent2f83b13bb570f2d488d1cb9444b1e22d9901b4ef
Merge branch 'hotfix/2.0.4'