Merge branch 'master' into 'master'

Falko Timme

2014-12-13 62fd31b9f97bc43dff837dcf525798153bfa2c98

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