Merge branch 'esr/maint-doc-fast-import' into maint
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)
* esr/maint-doc-fast-import:
  doc/fast-import: clarify how content states are built


Trivial merge