Merge remote-tracking branch 'ispc3master/master'

Dominik

2015-01-11 4d29e42f99f7a9b703be4764034d6794464dad26

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