Merge branch 'hotfix/2.6.6' v2.6.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:06:20 +0000 (14:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:06:20 +0000 (14:06 -0400)
commit0ed39c596852f369acec0cd11124617f05caa03f
tree7e854a0c63c2929f71f4ee0b69549f24650486a8
parentb2bcb8c5a0ef1ae94b5cd0ba1abcb9b5c457d6df
parent4f6189511037ef04bc0ee862132aeab421f78d96
Merge branch 'hotfix/2.6.6'