Merge branch 'master' into 'master'

Marius Cramer

2015-05-30 daf5a71d75dafb532b442e314d92ea3b7b7b0460

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