Merge branch 'maint'
commit2765233c64c35eb43a8b46c377fb8b464469221f
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Jun 2011 21:56:59 +0000 (21 14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Jun 2011 21:56:59 +0000 (21 14:56 -0700)
treea35acf3102d96c2518a9107198e54bd542258f84
parent13b70d2ad96a79fb439c6b4fc0e8058b1762bae2
parenta598ded1e2e9cc9f4ce93d091808b475839e6867
Merge branch 'maint'

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