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

Marius Cramer

2014-05-12 f1634087ea8a852b58ec13d5099e94771ed80849

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