Merge branch 'master' into 'master'

Marius Cramer

2015-03-01 e2e00df25e5561131b5b50d332f0de712b4244c7

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