From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Nov 2007 06:03:47 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe61935007b6803ce116e233316e4ff51de02be6;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  Remove a couple of duplicated include
  grep with unmerged index
  git-daemon: fix remote port number in log entry
  git-svn: t9114: verify merge commit message in test
  git-svn: fix dcommit clobbering when committing a series of diffs
---

fe61935007b6803ce116e233316e4ff51de02be6