Merge branch 'master' into 'master'

Marius Cramer

2014-03-27 d14f014166aefb9d3d650d37b29159ab378b068d

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