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

Till Brehm

2015-05-07 be531cf1d37d2293a572eef25d0190e23fc8a3b4

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