From: Pierre Spring <pierre@nelm.io>
Date: Wed, 14 Dec 2011 13:14:22 +0000 (+0100)
Subject: Merge branch 'master' into relative-date
X-Git-Tag: 1.3.0~33^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F100%2Fhead;p=thirdparty%2Fmoment.git

Merge branch 'master' into relative-date
---

bd7a57ea344c73cfa2f7e6c4d95f2587b4a3b43b
diff --cc moment.js
index f635a5f53,d2da69003..00b9a4547
--- a/moment.js
+++ b/moment.js
@@@ -11,9 -11,9 +11,9 @@@
          round = Math.round,
          languages = {},
          hasModule = (typeof module !== 'undefined'),
 -        paramsToParse = 'months|monthsShort|weekdays|weekdaysShort|longDateFormat|relativeTime|ordinal|meridiem'.split('|'),
 +        paramsToParse = 'months|monthsShort|weekdays|weekdaysShort|longDateFormat|relativeDate|relativeTime|ordinal|meridiem'.split('|'),
          i,
-         VERSION = "1.1.2",
+         VERSION = "1.2.0",
          shortcuts = 'Month|Date|Hours|Minutes|Seconds'.split('|');
  
      // left zero fill a number