Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-03-06 82b723df86594a89fb53607981488319e39b1b92

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