Merge branch 'pb/config' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 09:39:48 +0000 (02:39 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 09:39:48 +0000 (02:39 -0700)
commit9e37f72afe49c133bfc54b17b659b2ae6f189b7f
tree98aa954b22b9a24563da7e187fe034ef73831601
parent592689c46187165d80ab35c9090404b7ee248dbb
parente33d0611c0dd438ed9c1960518540c707201707a
Merge branch 'pb/config' into next