From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Dec 2010 21:50:11 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2cd900fcf577af2cc5094ba21d1699809649f3bc;p=git.git

Merge branch 'maint'

* maint:
  Prepare for 1.7.3.5
  Fix false positives in t3404 due to SHELL=/bin/false
  close file on error in read_mmfile()

Conflicts:
	RelNotes
---

2cd900fcf577af2cc5094ba21d1699809649f3bc