Merge branch 'master' into 'master'

Marius Cramer

2014-08-14 fef8248f430365a100bd585196ef7cdc04e5c131

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