Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

Marius Cramer

2013-12-18 5a234a89193bcaaf5b3f7dc1a99bb6c1b10c9df3

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