Merge branch 'master' into 'master'

Marius Cramer

2015-02-26 7cbed050417f967f34340661b7d7a8a7e42e5710

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