Merge branch 'hotfix/2.6.3' v2.6.3
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:06:02 +0000 (11:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:06:02 +0000 (11:06 -0400)
commit13c553ac6ca4bfc112cf38984f7bfa1ebfe9c902
treee1d8b770a46ac4a511c10ac79e51413b7c299312
parentb55654b24fda0c28aae3a9a59132e0bd8112c088
parent56d414d58cd08dfe8063b1d53dd11b345675a2e2
Merge branch 'hotfix/2.6.3'