Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:16 +0000 (12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:16 +0000 (12:44 -0800)
* maint:
gitweb: Fix project-specific feature override behavior
gitweb multiple project roots documentation

1  2 
gitweb/gitweb.perl
Simple merge