Code

Merge with master to pick up commit hook works.
authorJunio C Hamano <junkio@cox.net>
Sat, 20 Aug 2005 08:47:08 +0000 (01:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 20 Aug 2005 08:47:08 +0000 (01:47 -0700)

Trivial merge