Merge branch 'master' into 'master'

Marius Cramer

2015-05-05 b2f827b04393eecf33e16d6a883f5e6ff30086d9

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