Merge branch 'master' into 'master'

Marius Cramer

2014-02-11 e2b4f760bb91caf66445a888c7a185e972e97a3c

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