Merge branch 'master' into 'master'

Marius Cramer

2015-11-17 fe9b73c387c396036a272daa39a809ed02980563

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