From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jul 2011 16:45:41 +0000 (-0700)
Subject: Merge branch 'jn/mime-type-with-params'
X-Git-Tag: v1.7.7-rc0~86
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=54dbc1f9e6451b6673835259ce8aa450489fc420;p=git.git

Merge branch 'jn/mime-type-with-params'

* jn/mime-type-with-params:
  gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
  gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
---

54dbc1f9e6451b6673835259ce8aa450489fc420