Merge branch 'master' into 'master'

Marius Cramer

2014-07-07 b4945ae0c3f4e108090d05b34b3e7df8a753a2ec

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