Merge branch 'master' into rename-repo-url

diff/diff.d.ts

@@ -3,7 +3,7 @@
 // Definitions by: vvakame <https://github.com/vvakame/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module JsDiff {
+declare namespace JsDiff {
     interface IDiffResult {
         value: string;
         added?: boolean;