Merge branch 'master' into 'master'

Marius Cramer

2015-02-03 3dc6299457c24e0081baae684f6992b5def630ef

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