Merge refs/heads/master from .
commit466fede1bdfd55c78b71c71547b5b5a70adbaef2
authorJunio C Hamano <junkio@cox.net>
Wed, 31 Aug 2005 06:11:12 +0000 (30 23:11 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 31 Aug 2005 06:11:12 +0000 (30 23:11 -0700)
treee205fd7fafce8dc0a46cb27e3254dcf71794c072
parentfc1a4207b025ddd79d6383ed06f786c8a6f03289
parent914328ac02d3699407fe1df6b45ef4b7e8eff23a
Merge refs/heads/master from .