Merge branch 'master' into 'master'

Marius Cramer

2014-06-12 d3be569127300fa335a659c3ea40c100763d5fa9

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