Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2015-12-21 b25f400cd6bc255b01e05ac274f050ba4039a411

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