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

Marius Cramer

2014-10-31 1102cc886cf42a23cb3145cd9cc8b0d8f6123b61

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