Merge branch 'master' into 'master'

Marius Burkard

2016-01-10 c2dd9c58d6d3590c519e42bb2ec8e6a56e071118

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