Merge master into rc
authorJunio C Hamano <junkio@cox.net>
Sun, 14 Aug 2005 01:38:52 +0000 (18:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 Aug 2005 01:38:52 +0000 (18:38 -0700)
commitf4cedd483e5bc4b9553dbc40e084548f7f3bf2ab
tree3b208b89f1ee1167c5745467f82e858761d71f17
parent755d62788f0507781dbbf0ed1278b65ff4829185
parent068eac91ce04b9aca163acb1927c3878c45d1a07
Merge master into rc