Merge branch 'master' into 'master'

Marius Cramer

2015-11-14 b717d292577f33f2e2ca044da469d8663aa982f6

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