Merge branch 'master' into 'master'

Marius Cramer

2015-05-30 daf5a71d75dafb532b442e314d92ea3b7b7b0460

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