From: Andri Möll <andri@dot.ee>
Date: Thu, 16 Jun 2011 18:48:35 +0000 (-0700)
Subject: Fixed mixin with Underscore.
X-Git-Tag: 0.5.1^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5%2Fhead;p=thirdparty%2Fmoment.git

Fixed mixin with Underscore.
---

diff --git a/underscore.date.js b/underscore.date.js
old mode 100755
new mode 100644
index 076a5c674..7118e4bc6
--- a/underscore.date.js
+++ b/underscore.date.js
@@ -387,7 +387,7 @@
     // Integrate with Underscore.js
     } else {
         if (this._ !== undefined) {
-            this._.mixin(_date);
+            this._.mixin({date: _date});
         }
         this._date = _date;
     }