Code

Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Apr 2008 05:55:07 +0000 (22:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Apr 2008 05:55:07 +0000 (22:55 -0700)
commit30c0312fd182942c10421e77d2b3ec6284cc0468
treee72fda2a27115091cdb6352ebfaf1302dd814a7c
parent7b7f39eae6ab0bbcc68d3c42a5b23595880e528f
parentb3bb5f76e6193db102b063187be854ef3842d89b
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
git-cvsimport.perl
sha1_name.c