Merge branch 'master' into 'master'

Marius Cramer

2014-03-27 d14f014166aefb9d3d650d37b29159ab378b068d

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