Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 12 Mar 2006 11:29:11 +0000 (03:29 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 12 Mar 2006 11:29:11 +0000 (03:29 -0800)
commit28f7533f706d29b21fef199b9ad154df069fc624
treef610beb391ebe1e31827156e65612d96034714e6
parent514236aa5ab380cf7f585cb9195abdbb8080aac5
parent2d33501689989616a2dc003ca80fafa60b1ed5da
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