Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 19 Apr 2008 05:07:00 +0000 (22:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Apr 2008 05:07:00 +0000 (22:07 -0700)
commit4c414e2e09607d53141573710ef6d79db2aa64ae
tree991b179270a9c611c97c8d7e3d85fda677696fdc
parent24b6177e0261efba063c0b83ae0cdc5993945da9
parent29df2385d09611219c53d07f453794d6146e73a3
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  am: POSIX portability fix
git-am.sh