Merge branch 'master' into 'master'

Marius Cramer

2014-08-11 3f6ee66f65e910f741425078921bc804f91f8246

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