From: Junio C Hamano <junkio@cox.net>
Date: Fri, 24 Feb 2006 10:22:01 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~54^2~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b1ad31aa8ec806a2948d96dc2b6ac101f21ed6d;p=git.git

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.
---

1b1ad31aa8ec806a2948d96dc2b6ac101f21ed6d