Fixes wrong inhert & mixin arguments + added io.sockets

lib/io.js

@@ -51,6 +51,13 @@
    */
 
   io.j = [];
+  
+  /**
+   * Keep track of our io.Sockets
+   *
+   * @api private
+   */
+  io.sockets = {};
 
   /**
    * Expose constructors if in Node

lib/namespace.js

@@ -32,7 +32,7 @@
    * Apply EventEmitter mixin.
    */
 
-  io.util.mixin(io.EventEmitter, SocketNamespace);
+  io.util.mixin(SocketNamespace, io.EventEmitter);
 
   /**
    * Copies emit since we override it

lib/socket.js

@@ -37,7 +37,7 @@
       , 'auto connect': true
     };
 
-    io.util.merge(options, this.options);
+    io.util.merge(this.options, options);
 
     this.connected = false;
     this.open = false;
@@ -61,7 +61,7 @@
    * Apply EventEmitter mixin.
    */
 
-  io.util.mixin(io.EventEmitter, Socket);
+  io.util.mixin(Socket, io.EventEmitter);
 
   /**
    * Returns a namespace listener/emitter for this socket

lib/transport.js

@@ -29,7 +29,7 @@
    * Apply EventEmitter mixin.
    */
 
-  io.util.mixin(io.EventEmitter, Transport);
+  io.util.mixin(Transport, io.EventEmitter);
 
   /**
    * Handles the response from the server. When a new response is received

lib/util.js

@@ -224,7 +224,7 @@
 
   util.inherit = function (ctor, ctor2) {
     ctor.prototype = new ctor2;
-    util.merge(ctor2, ctor);
+    util.merge(ctor, ctor2);
   };
 
   /**