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

Marius Cramer

2013-11-03 78fc9a64bdd7fc1ac11c8718e097799236c0ba23

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