merging in #581

diff --cc moment.js
index 860bb92fc5b71d1137abff826b857e4d2d63c6c4,eb72570e50e9c60ff828467e745c9ec55a60f5b5..55f6a528a3b26a1cd9ce0033aa84a0833d5b2665
--- 1/moment.js
--- 2/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,

diff --cc test/moment/create.js
Simple merge