Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Jun 2016 15:28:11 +0000 (11:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Jun 2016 15:28:11 +0000 (11:28 -0400)
commit3f59b0e41db84090f14dba9b0b9f46117efa0736
tree7c1e3d997a1bff8d1985133eb60cd028c4146579
parent4db4907a53725bf8dc762a6c8e92936412b8f43f
parent88a2c026a52cc6ab36e2c1cf00202a6cbf293629
Merge branch 'hotfix/1.0.15'