Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Jan-Claas Dirks

2015-09-24 6fe4103fcb9f28ca1382218e0f1c52dbb89cb43d

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