Merge branch 'master' into 'master'

Till Brehm

2015-09-24 cedad166fa7655b0a49e7e27c57bbee78032fbe7

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