Merge branch 'nd/document-err-packet'
commita99c247c5380b83477e7f6ab4ba7b5488a49f28a
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Oct 2011 19:34:18 +0000 (12 12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Oct 2011 19:34:18 +0000 (12 12:34 -0700)
treea4eeda6786055a695bb9f968c480b486d9d8b34c
parentaf543833d4e10163af8045859cc081969fa5fcec
parentd78e5aecf931967bbaa4a8601cd40a5359e80e24
Merge branch 'nd/document-err-packet'

* nd/document-err-packet:
  pack-protocol: document "ERR" line