From: Junio C Hamano <junkio@cox.net>
Date: Tue, 29 May 2007 07:27:24 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~189
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=79d5576a4f2eada820802d2e7e19226e54f9de5d;p=git.git

Merge branch 'maint'

* maint:
  cvsserver: Fix some typos in asciidoc documentation
  cvsserver: Note that CVS_SERVER can also be specified as method variable
  cvsserver: Correct inetd.conf example in asciidoc documentation
  user-manual: fixed typo in example
  Add test case for $Id$ expanded in the repository
  git-svn: avoid md5 calculation entirely if SVN doesn't provide one
  Makefile: Remove git-fsck and git-verify-pack from PROGRAMS
  Fix stupid typo in lookup_tag()
  git-gui: Guess our share/git-gui/lib path at runtime if possible
  Correct key bindings to Control-<foo>
  git-gui: Tighten internal pattern match for lib/ directory
---

79d5576a4f2eada820802d2e7e19226e54f9de5d