Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

Marius Cramer

2014-01-02 0d11ae2055fe36d390e55065fa846c848a04ad07

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