Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

1
ALTER TABLE `web_domain` ADD `document_root_www` VARCHAR( 255 ) NULL AFTER `document_root`;