Merge branch 'mg/x-years-12-months' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2011 18:43:18 +0000 (11:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2011 18:43:18 +0000 (11:43 -0700)
* mg/x-years-12-months:
  date: avoid "X years, 12 months" in relative dates


Trivial merge