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

Florian Schaal

2014-01-04 8edb9c1a3051e03c25eef886171ec9de9c5c3dec

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