Merge branch 'master' into 'master'

Marius Burkard

2015-11-26 add7cc461c0729819c73b2bf44076037a1592517

1
ALTER TABLE `web_domain` ADD `backup_excludes` MEDIUMTEXT NULL AFTER `backup_copies` ;