Merge branch 'master' into 'master'

Marius Cramer

2014-10-29 871298f2b5dc76c4bdc8501464aeeeaa5a44677e

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