Merge branch 'master' into 'master'

Marius Cramer

2015-02-16 14f5a343328f7db49008255211af7cf08342a83c

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