Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Jan 2011 19:23:59 +0000 (11:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Jan 2011 19:23:59 +0000 (11:23 -0800)
* 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


Trivial merge