Merge branch 'hotfix/2.6.4' v2.6.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:09:36 +0000 (11:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:09:36 +0000 (11:09 -0400)
commit8123789fcf0eacf47843eebe2f99f3be26f90d39
tree33e08a7060242b47febbb188a5031e845874209b
parent13c553ac6ca4bfc112cf38984f7bfa1ebfe9c902
parente566bc2b9e59430f5fdec1100b5f825bf4e785d0
Merge branch 'hotfix/2.6.4'