From: Tim Wood <washwithcare@gmail.com>
Date: Tue, 5 Feb 2013 18:54:34 +0000 (-0800)
Subject: merging in #581
X-Git-Tag: 2.0.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e95d7ae46bbaa1f1257ac5aa38e1c9d2f9665c8;p=thirdparty%2Fmoment.git

merging in #581
---

5e95d7ae46bbaa1f1257ac5aa38e1c9d2f9665c8
diff --cc moment.js
index 860bb92fc,eb72570e5..55f6a528a
--- a/moment.js
+++ b/moment.js
@@@ -23,8 -23,8 +23,8 @@@
          aspNetJsonRegex = /^\/?Date\((\-?\d+)/i,
  
          // format tokens
-         formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|zz?|ZZ?|.)/g,
+         formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,
 -        localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?)/g,
 +        localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,
  
          // parsing tokens
          parseMultipleFormatChunker = /([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi,