Merge branch 'master' into rename-repo-url

express-session/express-session.d.ts

@@ -6,7 +6,7 @@
 /// <reference path="../express/express.d.ts" />
 /// <reference path="../node/node.d.ts" />
 
-declare module Express {
+declare namespace Express {
 
   export interface Request {
     session?: Session;
@@ -41,7 +41,7 @@ declare module "express-session" {
 
   function session(options?: session.SessionOptions): express.RequestHandler;
 
-  module session {
+  namespace session {
     export interface SessionOptions {
       secret: string;
       name?: string;
@@ -54,7 +54,7 @@ declare module "express-session" {
       saveUninitialized?: boolean;
       unset?: string;
     }
-	
+
 	export interface BaseMemoryStore {
       get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
       set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
@@ -62,15 +62,15 @@ declare module "express-session" {
       length?: (callback: (err: any, length: number) => void) => void;
       clear?: (callback: (err: any) => void) => void;
     }
-	
+
     export abstract class Store extends node.EventEmitter {
 	  constructor(config?: any);
-	  
+
 	  regenerate (req: express.Request, fn: (err: any) => any): void;
       load (sid: string, fn: (err: any, session: Express.Session) => any): void;
       createSession (req: express.Request, sess: Express.Session): void;
     }
-  
+
     export class MemoryStore implements BaseMemoryStore {
       get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
       set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;