Merged revisions 3100-3175 from stable branch.

tbrehm

2012-06-07 26c0fc98b880cf148ab348aefef85ac9b087597c

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