Merge branch 'stable-3.1'

Marius Burkard

2016-02-29 45e9406a0fd6e872219a09d913bdfa49bd22e87b

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