Merge branch 'master' into 'master'

Marius Cramer

2014-03-07 bed72531bfb1ca225bb2c009dfbacf8f09fcd128

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