Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into ...

Till Brehm

2014-06-06 efbb88feee52d96ca266485ea2e9d79ce54ff39a

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