Merge branch 'mg/x-years-12-months'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:43 +0000 (11:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:43 +0000 (11:36 -0700)
commit9f5df6fa670938a505a64edf1b779b1326311481
tree2c0081a3816b1ba8e580d3120ed2e00e2f9173b5
parent5033de916a1863d640d57dad238521411c1ed5ff
parentf1e9c548ce45005521892af0299696204ece286b
Merge branch 'mg/x-years-12-months'

* mg/x-years-12-months:
  date: avoid "X years, 12 months" in relative dates