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

Marius Cramer

2014-10-31 c28bb43232ab64cd17fc359fc482fc274974822f

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