From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Mar 2009 06:11:13 +0000 (-0700)
Subject: Merge branch 'maint-1.6.1' into maint
X-Git-Tag: v1.6.2.2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/510a309e5e0997c73d97c85332a99d622f06ace6?hp=--cc

Merge branch 'maint-1.6.1' into maint

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

510a309e5e0997c73d97c85332a99d622f06ace6