From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Aug 2011 18:41:26 +0000 (-0700)
Subject: Merge branch 'jn/mime-type-with-params' into maint
X-Git-Tag: v1.7.6.1~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5329c99795e187b36a527baa883efe5c3dc2f98c;p=git.git

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

* 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
---

5329c99795e187b36a527baa883efe5c3dc2f98c