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

Till Brehm

2016-04-12 7963164edf096905cf110f31fcc603a14ac22617

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;