Merge branch 'dnssec-wizard' into 'stable-3.1'

Till Brehm

2016-04-12 7963164edf096905cf110f31fcc603a14ac22617

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