Merge branch 'master' into 'master'

Marius Cramer

2014-05-09 da837c29d8a7dc5f5422c8e21bb83971079297c3

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