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

Marius Cramer

2015-01-08 d4acde6433ffda2c8a211d892991e96302b222ff

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;