Merge branch 'maint'
commite7ec9de67639d7c1715b450f54d297cc38e25867
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Feb 2010 23:52:12 +0000 (7 15:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Feb 2010 23:52:12 +0000 (7 15:52 -0800)
tree2cd108fb5e3e836f39872a52d810a84b43f2bcf7
parent8424981934c415bd20643de9cc932bd348dfb115
parentfe12d8e84f745303d64757307e9a6a81a6608018
Merge branch 'maint'

* maint:
  archive: simplify archive format guessing
builtin-archive.c