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

Marius Cramer

2014-11-27 b553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9

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