Merge branch 'master' into rename-repo-url

jasmine/jasmine-tests.ts

@@ -840,7 +840,7 @@ var customMatchers: jasmine.CustomMatcherFactories = {
     }
 };
 // add the custom matchers to interface jasmine.Matchers via TypeScript declaration merging
-declare module jasmine {
+declare namespace jasmine {
     interface Matchers {
         toBeGoofy(expected?: any): boolean;
     }

jasmine/jasmine.d.ts

@@ -41,7 +41,7 @@ declare function runs(asyncMethod: Function): void;
 declare function waitsFor(latchMethod: () => boolean, failureMessage?: string, timeout?: number): void;
 declare function waits(timeout?: number): void;
 
-declare module jasmine {
+declare namespace jasmine {
 
     var clock: () => Clock;
 

jasmine/legacy/jasmine-1.3.d.ts

@@ -26,7 +26,7 @@ declare function runs(asyncMethod: Function): void;
 declare function waitsFor(latchMethod: () => boolean, failureMessage?: string, timeout?: number): void;
 declare function waits(timeout?: number): void;
 
-declare module jasmine {
+declare namespace jasmine {
 
     var Clock: Clock;