Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 06:11:13 +0000 (23:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 06:11:13 +0000 (23:11 -0700)
commit510a309e5e0997c73d97c85332a99d622f06ace6
tree4736eb8c3b4f53071a31030fe20a9cfdeeadfcfc
parentb8fee3a3884b4a18c2f0b5313255dd180c44ab78
parent8e4f767ba77051aedaac7ef6639ee990778866c7
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  import-zips: fix thinko