Merge remote-tracking branch 'florian030/master'

Marius Cramer

2013-10-21 b533b414a075013307447a3fb895b1625504d477

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