Merge branch 'hotfix/2.1.15' v2.1.15
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:57:00 +0000 (17:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:57:00 +0000 (17:57 -0400)
commit0e97210a4455690e78bc38877d2167867df65142
tree98f2804686883faf15ed9a22b1a27ac7446107f4
parent812d4e9023a08a903da31f891c69ae9a51044f5a
parent743e60ec61f4b6cfd07761442853046c2e98eb9f
Merge branch 'hotfix/2.1.15'