Merge branch 'master' into 'master'

Marius Cramer

2014-08-11 3f6ee66f65e910f741425078921bc804f91f8246

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