Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 27 Jun 2009 20:44:25 +0000 (13:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 27 Jun 2009 20:44:25 +0000 (13:44 -0700)
* maint:
gitweb/README: fix AliasMatch in example
Test grep --and/--or/--not
Test git archive --remote
fread does not return negative on error

Trivial merge