Merge branch 'master' into 'master'

Marius Cramer

2014-08-14 fef8248f430365a100bd585196ef7cdc04e5c131

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