Merge branch 'master' into 'master'

Marius Cramer

2015-02-18 c582da1780e3d11b0d12deb42de281b92d76bf6f

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