Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Marius Burkard

2016-05-18 1f3c052e56cf937c12bda29df4d9887d8d8e95fc

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