Merge branch 'master' into 'master'

Marius Cramer

2014-06-05 4a569d979c0e5d39b7ac9cb72a02e7ac2e906962

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