Merge branch 'master' of github.com:diaspora/diaspora

lib/message_handler.rb

@@ -34,7 +34,7 @@ class MessageHandler
         http = EventMachine::HttpRequest.new(query.destination).get :timeout => TIMEOUT
         http.callback {process}
       when :hub_publish
-        http = EventMachine::PubSubHubBub.new(query.destination).get :timeout => TIMEOUT
+        http = EventMachine::PubSubHubbub.new(query.destination).get :timeout => TIMEOUT
         http.callback {process}
       else
         raise "message is not a type I know!"