Merge branch 'master' into 'master'

Marius Cramer

2015-01-14 66190e1134676f3addf703b0424761c21cad7c52

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