Test: Merge branch 'master' into dns-dnssec

A. Täffner

2016-01-27 08791fea529813a60987010b45533bd307990138

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