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

Till Brehm

2015-01-05 9ca1e3b8acc34e15ff4bdbdd4b61402da06b4227

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