Merge branch 'dns-dnssec-fix-dbmaster' into 'stable-3.1'

Till Brehm

2016-04-12 c92a4ee47ce5a7bb6b0e32a321ce09fece3e11dc

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