Merge branch 'master' into 'master'

Marius Cramer

2015-06-29 7bcf62fc4e4b119c68998e2570005695eb5778f8

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