Fixed merge problems in mysql_clientdb_plugin.inc.php

tbrehm

2012-01-12 4a8b7ecdf842a6ba7cdf0339067c6ed285cf60cb

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