Merged revisions 2794-2804 from stable branch.

tbrehm

2011-12-07 6882ab1634ec66e621e8964428f741cd7d103a00

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