Merge branch 'stable-3.0.5'

Marius Cramer

2015-12-08 2dffea3c8168906d0f6b0d8856faa85bb213c424

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