Merge branch 'master' into 'master'

Marius Cramer

2014-02-14 e100328a7f3d495dfddf71f7c71f24ac14bfd9a0

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