Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Mar 2007 10:05:25 +0000 (03:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Mar 2007 10:05:25 +0000 (03:05 -0700)
* maint:
Documentation/pack-format.txt: Clear up description of types.
fix typo in git-am manpage

Trivial merge