Merge branch 'maint-1.7.0' into maint-1.7.1
commit206af7c96b134b4962fa04fa174a25f29efd7e5e
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2011 22:32:47 +0000 (16 14:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2011 22:32:47 +0000 (16 14:32 -0800)
tree3e424daab965672034b6018067654dc697ed7d23
parent567323d387dda559dbdba8c15453aba629393955
parent547e8b9205349b47003ed25a82673e413e71c255
Merge branch 'maint-1.7.0' into maint-1.7.1

* maint-1.7.0:
  fast-import: introduce "feature notes" command
  fast-import: clarify documentation of "feature" command
fast-import.c