From: Isaac Cambron <isaac@isaaccambron.com>
Date: Fri, 22 Nov 2013 18:48:26 +0000 (-0500)
Subject: fix conflict between makeGlobal PRs
X-Git-Tag: 2.5.0^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fffe2f3e715c754a9ce2ff2276894ed680aa443d;p=thirdparty%2Fmoment.git

fix conflict between makeGlobal PRs
---

diff --git a/moment.js b/moment.js
index 3df90f0ce..5b46691b2 100644
--- a/moment.js
+++ b/moment.js
@@ -2293,7 +2293,7 @@
                 }
                 return local_moment.apply(null, arguments);
             };
-            extend(this.moment, local_moment);
+            extend(global.moment, local_moment);
         } else {
             global['moment'] = moment;
         }