Merge branch 'maint-1.5.4' into maint-1.5.5
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Jun 2008 00:14:03 +0000 (17:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Jun 2008 00:14:03 +0000 (17:14 -0700)
* maint-1.5.4:
  GIT 1.5.4.6
  git-shell: accept "git foo" form

Conflicts:

GIT-VERSION-GEN
RelNotes


Trivial merge