From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Mar 2009 06:11:03 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.2.2~7^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8e4f767ba77051aedaac7ef6639ee990778866c7;p=git.git

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  import-zips: fix thinko
---

8e4f767ba77051aedaac7ef6639ee990778866c7