Merge branch 'master' into 'master'

Marius Cramer

2014-02-14 e100328a7f3d495dfddf71f7c71f24ac14bfd9a0

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