Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-12-19 62e25488daa4f857f717d2687e820091ffaa8a13

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