Merge branch 'maint'
commitef3b38b445c183b2a07a6360de62908d312ade0f
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Nov 2008 04:36:54 +0000 (23 20:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Nov 2008 04:36:54 +0000 (23 20:36 -0800)
tree81f3713d6be793cea0cd340237f2d2911d112207
parentcbacbf4e55ba53d35567578d8c97fdea6b52e16a
parent37a7744ffe31af785571858f7341d588a6c66784
Merge branch 'maint'

* maint:
  Fix misleading wording for git-cherry-pick