Merge branch 'master' into 'master'

Marius Cramer

2014-08-14 c0914f828a0087636eb775c984680a410d975494

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