![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 24 Feb 2006 10:22:01 +0000 (02:22 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 24 Feb 2006 10:22:01 +0000 (02:22 -0800) | ||
| commit | 1b1ad31aa8ec806a2948d96dc2b6ac101f21ed6d | |
| tree | f5dd4cbc1b25d8f282543be22e755bfdb9e90395 | tree | snapshot |
| parent | 7465ef5155cec830a34dcffdd8272d4beb243220 | commit | diff |
| parent | a68de9592e4565a2cf3e14b3bc9c9cd57d7306d5 | commit | diff |
Merge branch 'master' into next
* master:
Merge fixes early for next maint series.
Merge branch 'fix' into maint
git-am: do not allow empty commits by mistake.
* master:
Merge fixes early for next maint series.
Merge branch 'fix' into maint
git-am: do not allow empty commits by mistake.