Merge branch 'master' into 'master'

Marius Cramer

2014-01-24 20e30b45aaaf068b0391ff4679e4f44a0fae8d6e

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