Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-07-08 341ef7175af7c8f21d27262b58da8f5bc2c06ef0

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