Merge refs/heads/master from .
commitb758087a02ebf310cd3c97e7efa77794be8ef410
authorJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 08:10:10 +0000 (30 01:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 08:10:10 +0000 (30 01:10 -0700)
treea543e2a458292f28da994f536e555ed9cbba1efe
parent1a965f3363ec03e608560d6ada18159a7721310f
parent61f01a5b773915402da37a34e706db56fe90b776
Merge refs/heads/master from .