From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Feb 2008 08:00:09 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~124
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=25c4f61c51a91051dcba3b8bbbac4c61aa69cc19;p=git.git

Merge branch 'maint'

* maint:
  templates/Makefile: don't depend on local umask setting
  Correct name of diff_flush() in API documentation
  Start preparing for 1.5.4.4

Conflicts:

	RelNotes
---

25c4f61c51a91051dcba3b8bbbac4c61aa69cc19