Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-04-30 8edabf647814a012307bbf68628e4656ecf89eff

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