Merge branch 'hotfix/1.1.1' v1.1.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 3 Feb 2016 16:31:34 +0000 (11:31 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 3 Feb 2016 16:31:34 +0000 (11:31 -0500)
commit2c4ded8aa47a1eeedc13ee9be9feee2920014907
treeaaadab5c3a4bac6ed8f732253403349645cbb707
parentd3b00e5f4722f5caadfd8e0c143c8d7cc4fa4476
parent52c052ec7e9ed8a69c912a52a72af0318505922d
Merge branch 'hotfix/1.1.1'