Merge branch 'master' into next
commit07419c952633f427ce186bf4c2b9a49592c9d3d3
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:59:15 +0000 (8 22:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:59:15 +0000 (8 22:59 -0700)
treeb0da244b25e7b996d8cf905d276673944ce6b9f8
parent703bdcf9e5ad91e669ce4c834d8d17a47c9e720e
parent212f0ba357cde43d1cf66692f73a2f662d13ac55
Merge branch 'master' into next

* master:
  Start 1.7.2 cycle
  cherry-pick: do not dump core when iconv fails
  Makefile: Fix 'clean' target to remove all gitweb build files
Makefile