From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Apr 2008 05:55:07 +0000 (-0700)
Subject: Merge branch 'maint-1.5.4' into maint
X-Git-Tag: v1.5.5.2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=30c0312fd182942c10421e77d2b3ec6284cc0468;p=git.git

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  cvsimport: always pass user data to "system" as a list
  fix reflog approxidate parsing bug
---

30c0312fd182942c10421e77d2b3ec6284cc0468