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

Marius Cramer

2015-05-25 eb35b58576960c6f007c77ccdae11a99a106c3f4

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