Merge branch 'master' into 'master'

Marius Cramer

2014-01-28 c1bef897ed1abaf9c5730b339d6de3d950d2f980

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