Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 b973ff1298fed20030a13d86e1233151a7e3189b

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