Merge branch 'master' into 'master'

Marius Cramer

2014-06-05 4a569d979c0e5d39b7ac9cb72a02e7ac2e906962

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