Merge branch 'master' into dns-dnssec

A. Täffner

2016-01-20 cab3bca1d75be6c7f3140a35396d8c6ee2011801

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