Merge remote-tracking branch 'ispc3master/master'

Dominik

2014-01-27 7bc0bcdf33dba22dcae84bd1d3e65898b742a4bc

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