Merge branch 'hotfix/1.1.2' v1.1.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 3 Feb 2016 16:39:02 +0000 (11:39 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 3 Feb 2016 16:39:02 +0000 (11:39 -0500)
commit86f9dc8190a3ce6019493e02d32ce9619060e2b1
treea46cbd7dd9e0992e5bd9fff4a3fac11bbb0e38cf
parent2c4ded8aa47a1eeedc13ee9be9feee2920014907
parent101a7b134e220e70349f872c91f23eebb8c49c26
Merge branch 'hotfix/1.1.2'