Merge branch 'hotfix/1.0.15'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:25:26 +0000 (17:25 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:25:26 +0000 (17:25 -0500)
commit8ce05fb8b75e301381c3da9d7f544c55c588f782
treea4c0cf99f0cf5bcaa425b12be9524c12c3ad2188
parent7f02165ea4446360f517e3b010dccf65823f9d71
parentdb697895ff66d165e590cc1419d627a2d6f78568
Merge branch 'hotfix/1.0.15'