Merge branch 'master' into 'master'

Marius Cramer

2015-02-26 7cbed050417f967f34340661b7d7a8a7e42e5710

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