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


Trivial merge