tree 0d12b068502c3cc0512ec44628c26f75c6438b16
parent 4afbcab9898ce63ad641dd0de6e9b69deda44330
parent 872354dcb3ce5f34f7ddb12d2c89d26a1ea4daf0
author Junio C Hamano <gitster@pobox.com> 1214525643 -0700
committer Junio C Hamano <gitster@pobox.com> 1214525643 -0700

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