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

Till Brehm

2015-04-01 3f916ccb6ae7dca534054f1be1e337732b171ed0

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