![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 16 Mar 2006 00:15:23 +0000 (16:15 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 16 Mar 2006 00:15:23 +0000 (16:15 -0800) | ||
| commit | f2cb4004fd5b3ec4b11ad8ee6a374a55e9292732 | |
| tree | ec498f9c82262b683ec473aad5144bfc6f332a3c | tree | snapshot |
| parent | 64ecb6247f89783a53297436fa452478a83bda53 | commit | diff |
| parent | 6169858d19b0ee01a549d83f222c097549968d66 | commit | diff |
Merge branch 'master' into next
* master:
fix imap-send for OSX
Let merge set the default strategy.
* master:
fix imap-send for OSX
Let merge set the default strategy.