Merge branch 'master' into 'master'

Marius Cramer

2014-01-28 c1bef897ed1abaf9c5730b339d6de3d950d2f980

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