tree a35acf3102d96c2518a9107198e54bd542258f84
parent 13b70d2ad96a79fb439c6b4fc0e8058b1762bae2
parent a598ded1e2e9cc9f4ce93d091808b475839e6867
author Junio C Hamano <gitster@pobox.com> 1308693419 -0700
committer Junio C Hamano <gitster@pobox.com> 1308693419 -0700

Merge branch 'maint'

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