From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Dec 2010 01:49:42 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f29db856e7a736dd5109223d71c548367bc127ae;p=git.git

Merge branch 'maint'

* maint:
  gitweb: Include links to feeds in HTML header only for '200 OK' response
  fsck docs: remove outdated and useless diagnostic
  userdiff: fix typo in ruby and python word regexes
  trace.c: mark file-local function static
  Fix typo in git-gc document.
---

f29db856e7a736dd5109223d71c548367bc127ae