Code

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)
commit04a67dc622b298226628fe344af835a7191dc1aa
tree4b0c675e0ce135634202dfb9374fef01fd414d1e
parenta1dd7e16ad6df793fc393d6df8e9082261a0ce42
parentf1e9c548ce45005521892af0299696204ece286b
Merge branch 'mg/x-years-12-months' into maint

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