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

Marius Cramer

2014-04-28 5f6dd42906472fbded5f9fd122379f15ad3307c0

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