Merge with master changes.
authorJunio C Hamano <junkio@cox.net>
Tue, 16 Aug 2005 19:13:16 +0000 (12:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 Aug 2005 19:13:16 +0000 (12:13 -0700)
commit1f40c7c24d999675df818f9d7824937a964f9f40
tree7918cb1acd31a6be7b122cd4bc2e873f5b333b36
parent14fb44880c1143ae0259842c808c036e78b516f6
parentabe0582207c72ec848e78707577c61a98f5c633d
Merge with master changes.