Merge branch 'master' into rename-repo-url

asyncblock/asyncblock.d.ts

@@ -7,7 +7,7 @@
 declare module "asyncblock" {
   function asyncblock<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
 
-  module asyncblock {
+  namespace asyncblock {
     export function nostack<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
 
     export interface IFlow {