Merge branch 'csr_challenge_password' into 'master'

Marius Cramer

2015-07-30 1271ad0e6995d021f5265365d1528709b3b9bb33

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