Merge branch 'stable-3.0.5'

Marius Cramer

2015-05-21 985390fdb8ba94cbcf7312e32a484396c3d49702

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