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

Falko Timme

2014-11-28 756b8360e90c4884f1bd6d7e84656c24b450eee7

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