From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Jan 2011 19:36:12 +0000 (-0800)
Subject: Merge branch 'sr/gitweb-hilite-more'
X-Git-Tag: v1.7.4-rc2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=17fd68d0d8f948c23993275aa618c16b83958cd8;p=git.git

Merge branch 'sr/gitweb-hilite-more'

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

17fd68d0d8f948c23993275aa618c16b83958cd8