Merge tag 'v1.2.18' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 19:12:09 +0000 (14:12 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 19:12:09 +0000 (14:12 -0500)
commitea190c2993ac4591ff1f1e81c1ebbb2f265dac5e
treee70d9e48b66ee9ce0d4c1a31dffd94e8c9ab3cab
parentf067bb95b74ea609fe706518a6d51e6525a4194e
parentdce608f06815c215aa8c0df307a7a4f7e6fd4953
Merge tag 'v1.2.18' into develop

merging branch after link fix