Merge branch 'master' into 'master'

Marius Cramer

2014-10-13 559b657f9fc6a5374de9b7b1caf20abd4e308d76

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