Merge branch 'master' into 'master'

Marius Cramer

2014-03-07 bed72531bfb1ca225bb2c009dfbacf8f09fcd128

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