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)
commit2766ccad4c2f181f1e6325c849950a9a1f9dd24b
tree5f72e3c95b320fa6eb3d9afcec642e3c7dcd1b9a
parentdee8dc8369a19c1b8b12dd40bf3a563a7524825b
parentf2665ec9fa42b75d92d0301cff85362836c5729a
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