Merge branch 'esr/maint-doc-fast-import' into maint
commita7c940edce6554cb57468a8a9936277b709cc7fc
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 21:28:31 +0000 (27 13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 21:28:31 +0000 (27 13:28 -0800)
tree5556a5f0c1ddd9a0006d6a1bbe356a5a8b0a2047
parent2207e104abc5233b5ad671448b4c653db3c0faba
parente70528862f0f67fdb6bd67d8819d5b01156eacdc
Merge branch 'esr/maint-doc-fast-import' into maint

* esr/maint-doc-fast-import:
  doc/fast-import: clarify how content states are built