Merge branch 'master' into 'master'

Marius Cramer

2014-11-06 a66bbd6cba18494f48190025b525f903ef3d384d

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