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

Till Brehm

2015-04-01 3f916ccb6ae7dca534054f1be1e337732b171ed0

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