Merge branch 'fix_is_reseller' into 'master'

Marius Cramer

2014-07-08 8db41e9b3309300054907d2183692dd5fa0f0d56

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