Merge branch 'hotfix/1.1.2' v1.1.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 5 Aug 2016 19:30:00 +0000 (15:30 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 5 Aug 2016 19:30:00 +0000 (15:30 -0400)
commit2d476571a2c36a1dfeb8986b93e3372dc638a0e0
treeaf3040cb2ad3f0e9c3bd692f87a538f9c498e911
parent046ac08542aa10a834d96250789bc24929f72f7d
parentd000b3dd332895b80f6e68421333fc8803ab8ae2
Merge branch 'hotfix/1.1.2'