From: Abdel Said <abdel@meapix.com>
Date: Mon, 26 Nov 2012 02:13:23 +0000 (-0500)
Subject: Merge commit '5a990196f8' into develop
X-Git-Tag: 2.0.0~33^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdf4dfdd8b1ad2e76d359a54b7915faf5d87db40;p=thirdparty%2Fmoment.git

Merge commit '5a990196f8' into develop

Conflicts:
	moment.js
---

bdf4dfdd8b1ad2e76d359a54b7915faf5d87db40
diff --cc moment.js
index 9d67f90c1,12ae51f48..e0148161c
--- a/moment.js
+++ b/moment.js
@@@ -42,7 -34,8 +35,8 @@@
          parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999
          parseTokenThreeDigits = /\d{3}/, // 000 - 999
          parseTokenFourDigits = /\d{1,4}/, // 0 - 9999
+         parseTokenSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999
 -        parseTokenWord = /[0-9]*[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+/i, // any numbers followed by word characters
 +        parseTokenWord = /[0-9a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+\s*?[0-9a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+/i, // any word (or two) characters or numbers. Added \s*?... to match arabic two word month.
          parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/i, // +00:00 -00:00 +0000 -0000 or Z
          parseTokenT = /T/i, // T (ISO seperator)