Merge branch 'master' into 'master'

Marius Cramer

2014-02-11 e2b4f760bb91caf66445a888c7a185e972e97a3c

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