Andrew's git / gitweb.git / diff
?
Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 16 Mar 2006 00:15:23 +0000 (16:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 16 Mar 2006 00:15:23 +0000 (16:15 -0800)
* master:
fix imap-send for OSX
Let merge set the default strategy.

Trivial merge