From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Jun 2010 18:45:27 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f526d120f649ec4426b559e94e09655b5a4f2b87;p=git.git

Merge branch 'maint'

* maint:
  msvc: Fix some compiler warnings
  Documentation: grep: fix asciidoc problem with --
  msvc: Fix some "expr evaluates to function" compiler warnings
---

f526d120f649ec4426b559e94e09655b5a4f2b87