From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Jun 2008 00:14:03 +0000 (-0700)
Subject: Merge branch 'maint-1.5.4' into maint-1.5.5
X-Git-Tag: v1.5.5.5~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=53b22a9e45161004ff3260782abc4ee2a5b3e730;p=git.git

Merge branch 'maint-1.5.4' into maint-1.5.5

* maint-1.5.4:
  GIT 1.5.4.6
  git-shell: accept "git foo" form

Conflicts:

	GIT-VERSION-GEN
	RelNotes
---

53b22a9e45161004ff3260782abc4ee2a5b3e730