Merge branch 'nd/document-err-packet' into next
commit0c5f5d073e48f8f3d423786cc273d5e557c36937
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:42:01 +0000 (6 15:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:42:01 +0000 (6 15:42 -0700)
tree43d5da782ba939786f28e8443d7d1b0ae0af55f8
parent5f3630f46e6176439739d53954d4b3ddd363e64a
parentd78e5aecf931967bbaa4a8601cd40a5359e80e24
Merge branch 'nd/document-err-packet' into next

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