From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 27 Jun 2009 20:44:25 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~38
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2dc7f40d4424f66e1324a1600de3fcdd115ab07f;p=git.git

Merge branch 'maint'

* maint:
  gitweb/README: fix AliasMatch in example
  Test grep --and/--or/--not
  Test git archive --remote
  fread does not return negative on error
---

2dc7f40d4424f66e1324a1600de3fcdd115ab07f