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