Merge branch 'hotfix/1.0.25' v1.0.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 19:57:06 +0000 (15:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 19:57:06 +0000 (15:57 -0400)
commit75b6ea3aba403f9749b68b64838f2695327db557
treeadef9094cdc904234adcbd7d2521c56a05d065f8
parentf64dc1bc1ba303048225388073389b4da198d4a7
parentd1a25843453582c1c1f14d8e36b40ff756b4e72d
Merge branch 'hotfix/1.0.25'