Merge branch 'sr/gitweb-hilite-more' into next
commit6b52e7e5333fe26107c12206fc703075773277d0
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:07 +0000 (5 14:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:07 +0000 (5 14:25 -0800)
tree2ed7807d4ce52fa990673890c2a2e973fea9aec1
parentff38429f7c08df404e6561509c81e3823615f36a
parent3ca7353cab4ed6c7efac0c8d7477c87112fc7350
Merge branch 'sr/gitweb-hilite-more' into next

* sr/gitweb-hilite-more:
  gitweb: remove unnecessary test when closing file descriptor
  gitweb: add extensions to highlight feature map
gitweb/gitweb.perl