Merge branch 'esr/maint-doc-fast-import'
commit22d33a20f9327deeec2243b4c18b8f77989e9552
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2012 21:32:48 +0000 (21 13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2012 21:32:48 +0000 (21 13:32 -0800)
treea120e8391c3c34dff336b2cc8cc46a70f831d547
parent681b036fa0461fa40f5c8caedd06579ab52e671e
parente70528862f0f67fdb6bd67d8819d5b01156eacdc
Merge branch 'esr/maint-doc-fast-import'

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