Merge branch 'hotfix/2.4.2' v2.4.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:36:21 +0000 (12:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:36:21 +0000 (12:36 -0400)
commit2663d47a1140693fa259fda32767c0cc2732ed19
treefa3410508e5d40333dccbd4faa83403d6919000f
parentff757cdb48e5d13ff13db450e5a284050bdf0344
parent4a19cc5d6578acd5524a4efd5e31f791fe1b260a
Merge branch 'hotfix/2.4.2'