Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 01:13:15 +0000 (17:13 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 01:13:15 +0000 (17:13 -0800)
commitaf99711cd84c30a16450f73dbc21ba9f9f9803e6
tree2e0cbaecae75783e2e15e9f6600c04bd9ce95f0b
parent78e90f89e39b112af2670516f80586163dcd56ca
parentefa13f7b7ea1605deab3a6478fa0d0706c828170
Merge branch 'maint'

* maint:
  pretend-sha1: grave bugfix.