From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Jan 2011 19:23:59 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~37
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2766ccad4c2f181f1e6325c849950a9a1f9dd24b;p=git.git

Merge branch 'master' into next

* master:
  daemon: support <directory> arguments again
  Fix typos in the documentation
  gitweb: skip logo in atom feed when there is none
  t9001: Fix test prerequisites
---

2766ccad4c2f181f1e6325c849950a9a1f9dd24b