Merge branch 'master' into 'master'

Marius Cramer

2015-09-04 842b5c34e70869b7b1a0d368cbb6280f737301d3

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