Merge branch 'master' into 'master'

Marius Cramer

2014-03-29 85e29ab6d2cd43e348cba2c6a73a7263217d139d

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