Merge branch 'master' into middlewares

Conflicts:
	docs/index.rst

docs/index.rst

@@ -349,6 +349,9 @@ first add ``MW1`` and then ``MW2``.
     def foo(sid):
         # ...
 
+Note: if an event has a handler in a class-based namespace, and also a
+decorator-based function handler, the standalone function handler is invoked.
+
 Using a Message Queue
 ---------------------
 

socketio/server.py

@@ -161,9 +161,9 @@ class Server(object):
     def register_namespace(self, namespace_handler):
         """Register a namespace handler object.
 
-        :param namespace_handler: A namespace subclass that handles all the
+        :param namespace_handler: An instance of a :class:`Namespace`
-                                  event traffic for a namespace. This method
+                                  subclass that handles all the event traffic
-                                  accepts the class itself, or an instance.
+                                  for a namespace.
         """
         if not isinstance(namespace_handler, namespace.Namespace):
             raise ValueError('Not a namespace instance')