Merge branch 'hotfix/1.2.18' v1.2.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 19:11:51 +0000 (14:11 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 19:11:51 +0000 (14:11 -0500)
commitdce608f06815c215aa8c0df307a7a4f7e6fd4953
treee70d9e48b66ee9ce0d4c1a31dffd94e8c9ab3cab
parent63e5f82de4b24f6e0b14e48fe20d75d48bc3bd99
parent8b6a4955d684ac520e4a76bfb572cfc7a58d420f
Merge branch 'hotfix/1.2.18'