From: Junio C Hamano <junkio@cox.net>
Date: Sun, 12 Mar 2006 11:29:11 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~35
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=28f7533f706d29b21fef199b9ad154df069fc624

Merge branch 'master' into next

* master:
  imap-send: Add missing #include for macosx
  git-diff: -p disables rename detection.
  imap-send: cleanup execl() call to use NULL sentinel instead of 0
  annotate.perl triggers rpm bug
---

28f7533f706d29b21fef199b9ad154df069fc624