Merge branch 'stable-3.0.5' into 'master'

Marius Cramer

2014-02-25 230339ed643ed504f42660ca0541f5af85c5a684

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