Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Jun 2011 21:56:59 +0000 (14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Jun 2011 21:56:59 +0000 (14:56 -0700)
* maint:
gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled

1  2 
gitweb/gitweb.perl
Simple merge