From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Apr 2008 06:06:30 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68951af30c2ac7f74f0d794a8674ac320a84250a;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  cvsimport: always pass user data to "system" as a list
  fix reflog approxidate parsing bug
  Fix use after free() in builtin-fetch
  fetch-pack: do not stop traversing an already parsed commit
  Use "=" instead of "==" in condition as it is more portable
---

68951af30c2ac7f74f0d794a8674ac320a84250a