Merge branch 'master' into 'master'

Marius Cramer

2015-08-17 363cb9591d68e99169ff6d6a29f2e29daf16cd13

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