From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Jun 2008 01:08:51 +0000 (-0700)
Subject: Merge branch 'maint-1.5.5' into maint
X-Git-Tag: v1.5.6.2~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7ac749c96d143ba4f76723959892cbaddbe8ed07;p=git.git

Merge branch 'maint-1.5.5' into maint

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

Conflicts:

	GIT-VERSION-GEN
	RelNotes
---

7ac749c96d143ba4f76723959892cbaddbe8ed07