Merge branch 'master' into 'master'

Marius Cramer

2015-05-07 f6e42fc631acad20006ad79f63ccecc0a86ad0eb

1
2
3
-- --------------------------------------------------------
 
ALTER TABLE `web_domain` ADD `web_folder` VARCHAR( 100 ) DEFAULT NULL AFTER `document_root` ;