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

Till Brehm

2016-04-07 b203f3ee3774b6335e70f105172eba688fec28bb

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