Merge branch 'master' of http://git.ispconfig.org/Cambra/ispconfig3 into Ca...

Marius Cramer

2014-07-01 dbf29d9979fe779e8801685c0132dbee681e15cf

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