Merge branch 'master' into 'master'

Marius Cramer

2015-02-03 3dc6299457c24e0081baae684f6992b5def630ef

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