Merge branch 'master' into relative-date

diff --cc lang/pt.js
Simple merge

diff --cc moment.js
index f635a5f533660832d6730d2e8e8594bea8973af8,d2da69003cff01a8f4637d37b7ef78556e71b1eb..00b9a454739e587e3d780a3da63606e39339bc89
--- 1/moment.js
--- 2/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