Merge branch 'master' into 'master'

Marius Cramer

2015-05-05 10131039b1669f3bd4485ab71c33505de0dd377c

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