Merge branch 'maint-1.6.0' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 06:11:03 +0000 (23:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 06:11:03 +0000 (23:11 -0700)
commit8e4f767ba77051aedaac7ef6639ee990778866c7
tree3883ab313ee3ba979cd8893684f243dd8b997c82
parent81db4abf84ec7fbebeb08f6ad506138da2e7e4cd
parent63801da88d8638eb6cf26d6305a721ad3731e216
Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  import-zips: fix thinko