Merge branch 'master' into 'master'

Marius Cramer

2014-01-24 b50d36a340f2cb3a54f7fa29699ec5d0f064f31c

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