Merged revisions 3670-3683 from 3.0.5 stable branch.

tbrehm

2012-11-20 68ec43740a49be874d629f4d2e9be9787c3ae2ea

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