Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 24 Feb 2006 10:22:01 +0000 (02:22 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 24 Feb 2006 10:22:01 +0000 (02:22 -0800)
* master:
Merge fixes early for next maint series.
Merge branch 'fix' into maint
git-am: do not allow empty commits by mistake.

Trivial merge