Merge branch 'master' into 'master'

Marius Cramer

2015-02-15 427cd2f62e87fc13fee43ecf764418c7ca5ae520

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