Merge branch 'hide_client' into 'master'

Marius Cramer

2014-07-09 8164cdd8c7f87d977ec35738ca121c7fc6e1cb2e

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