From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Jun 2011 21:56:59 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.6-rc3~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2765233c64c35eb43a8b46c377fb8b464469221f;p=git.git

Merge branch 'maint'

* maint:
  gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
---

2765233c64c35eb43a8b46c377fb8b464469221f