Merge branch 'master' into 'master'

Marius Cramer

2015-05-05 10131039b1669f3bd4485ab71c33505de0dd377c

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