Merge branch 'master' into next
commit84d3915d5f353429dfe0e754b9a9582de7e8ceea
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Jun 2010 18:45:31 +0000 (25 11:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Jun 2010 18:45:31 +0000 (25 11:45 -0700)
treee58b6fcc5177ca044968a735fe8d4b5829c34379
parenta0d99cfa2b45c003fcc219d53f29988f82ced6c1
parentf526d120f649ec4426b559e94e09655b5a4f2b87
Merge branch 'master' into next

* master:
  msvc: Fix some compiler warnings
  Documentation: grep: fix asciidoc problem with --
  msvc: Fix some "expr evaluates to function" compiler warnings
Documentation/git-grep.txt
builtin.h