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

Till Brehm

2015-11-15 0c1bc352c2f2984b19e43cc5e6182976a155fc0c

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