Merge refs/heads/master from .
commit168cc639adb29616bde22f97f153faa1dfd024eb
authorJunio C Hamano <junkio@cox.net>
Wed, 24 Aug 2005 04:30:42 +0000 (23 21:30 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 Aug 2005 04:30:42 +0000 (23 21:30 -0700)
treeb4afe3f6dd6eaa970cb0e5dba2d3fe640843121f
parent58eaf287f1b25f6427b06bd72d8e555615828aeb
parent0d6a873cfe4ba9428cf361c633faf701cadc04b8
Merge refs/heads/master from .