Merge branch 'fs3933' into 'master'

Marius Cramer

2015-08-05 92edaf22dd892540ebf5a415464c6434ce72fb20

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