Merge branch 'stable-3.1'

Marius Burkard

2016-02-10 88c307b0ef30a94ea5e9b52a1f9078bf04033d29

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