Merge commit 'gfi/master'
authorJunio C Hamano <junkio@cox.net>
Sun, 29 Apr 2007 08:54:28 +0000 (01:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 29 Apr 2007 08:54:28 +0000 (01:54 -0700)
commit25dc5e2995cc60c59a29b07963f71a1f7608b52f
tree5e51fb9d639bf6b6b99ae5d01286360b7303f2f1
parent39231b1c32caee10c7ac3397341ea0c6cf56e7f9
parentaff787b52bc8e1d7fcfce5d28d1fc569f905d3c1
Merge commit 'gfi/master'

* commit 'gfi/master':