tree 3e956e2518512ded3fd9987aad7ac10d3f1850b4
parent 6db5c6e43dccb380ca6e9947777985eb11248c31
parent 8e09fd1a1e5ea8eaec960d47be51bde85df8870e
author Junio C Hamano <gitster@pobox.com> 1326761156 -0800
committer Junio C Hamano <gitster@pobox.com> 1326761156 -0800

Merge branch 'jn/maint-gitweb-grep-fix'

* jn/maint-gitweb-grep-fix:
  gitweb: Harden "grep" search against filenames with ':'
  gitweb: Fix file links in "grep" search