Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Feb 2008 08:00:09 +0000 (00:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Feb 2008 08:00:09 +0000 (00:00 -0800)
* 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

Trivial merge