Merge branch 'master' into 'master'

Marius Cramer

2015-07-30 a014597671651cdc10f88a2816ea39b9f1451666

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