Merge branch 'master' into rename-repo-url

bluebird-retry/bluebird-retry.d.ts

@@ -9,7 +9,7 @@ declare module "bluebird-retry" {
 
 	function retry<T>(func:(param:T)=>void, options?:retry.Options):Promise<T>;
 
-	module retry {
+	namespace retry {
 		export interface Options {
 			interval?:number;
 			backoff?:number;
@@ -21,4 +21,4 @@ declare module "bluebird-retry" {
 	}
 
 	export = retry;
-}
+}