Merge branch 'master' into 'master'

Marius Cramer

2014-05-09 da837c29d8a7dc5f5422c8e21bb83971079297c3

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