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

Marius Cramer

2014-02-27 361156e8395d3837a4cd0ff7a417d3ca8dc16a40

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