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

Marius Cramer

2013-12-27 6b1d788d1d50fd38f68f152285f3fa816a9d7880

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