Merge branch 'origin'
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 02:42:08 +0000 (18:42 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 02:42:08 +0000 (18:42 -0800)
commitc1a4066f67d4be2e081eef52d0ac90d75c2178c4
tree770dab95ac253c4a886dc38f60e1abbebb5ad51b
parent17e735177e29373ab8625bc34761c5030f9608fe
parentcd3b0b635a942a0ed8788bbc302132554cfc79d9
Merge branch 'origin'