From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Apr 2009 05:35:57 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.2.2~7^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f054a419419337142ffe40433aa3984ccc000624;p=git.git

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  Documentation: Remove an odd "instead"
---

f054a419419337142ffe40433aa3984ccc000624