Merge branch 'feature/add_spdy_option' into 'master'

Falko Timme

2014-12-12 7c57f78468664a8a62b555798834b4cf5b5e9bef

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