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

Till Brehm

2014-11-12 40317cfd73aaa530e3c4ad8488a40c3a9b611f17

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