Merge branch 'master' into 'master'

Marius Cramer

2014-02-25 0e3e3c99217c80068fe620460c7a331c34fe1b40

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