Merge branch 'master' into next
commita0221eec0b0d4e4675a391ce65fe7cba1f6724f4
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Aug 2008 08:12:25 +0000 (19 01:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Aug 2008 08:12:25 +0000 (19 01:12 -0700)
treea249f9768c4b4df33003cc64ca30de1e8fd84e48
parent2858d21488d8aabf92fef7835f97f8e271c31acf
parentc6670b348cb19c74a6d7f6943df4871eb0d8295f
Merge branch 'master' into next

* master:
  t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
  adapt git-cvsserver manpage to dash-free syntax
  mailinfo: re-fix MIME multipart boundary parsing