Merge branch 'master' into 'master'

Falko Timme

2014-12-13 62fd31b9f97bc43dff837dcf525798153bfa2c98

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