From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Nov 2007 05:30:06 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~196
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1a82fe9a3de780fb2f1fe054d692294544f01e7;p=git.git

Merge branch 'maint'

* maint:
  Update draft release notes for 1.5.3.6
  Fix per-directory exclude handing for "git add"
  core.excludesfile clean-up
  Fix t9101 test failure caused by Subversion "auto-props"
  git-send-email: add charset header if we add encoded 'From'
---

f1a82fe9a3de780fb2f1fe054d692294544f01e7