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

Till Brehm

2014-11-12 40317cfd73aaa530e3c4ad8488a40c3a9b611f17

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