Merge branch 'maint'

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

Junio C Hamano committed Jun 21, 2011 at 14:56 UTC 2765233c64c35eb43a8b46c377fb8b464469221f

No changes.