From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Jan 2011 19:23:45 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2665ec9fa42b75d92d0301cff85362836c5729a;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  gitweb: skip logo in atom feed when there is none
  t9001: Fix test prerequisites
---

f2665ec9fa42b75d92d0301cff85362836c5729a