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

Marius Cramer

2013-11-25 5b5f7c5ea79c0c9efcb4ecae4bdf1224e8486833

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