From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Feb 2011 22:32:59 +0000 (-0800)
Subject: Merge branch 'maint-1.7.2' into maint-1.7.3
X-Git-Tag: v1.7.4.2~52^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da656f17d37fe96454645c08f21a24134f5aa900;p=thirdparty%2Fgit.git

Merge branch 'maint-1.7.2' into maint-1.7.3

* maint-1.7.2:
  fast-import: introduce "feature notes" command
  fast-import: clarify documentation of "feature" command
---

da656f17d37fe96454645c08f21a24134f5aa900