Merge branch 'stable-3.0.5' into 'stable-3.0.5'

Marius Cramer

2014-05-05 c9d4ef4e593bde5a12d3eaa19b44ea5829866004

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