Merge branch 'jn/gitweb-patch' into maint
commit9453f8aa070bd75bc5fc4bc007223386ab85bb7a
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:37:36 +0000 (15 16:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:37:36 +0000 (15 16:37 -0800)
tree63a83b4ffe5d039f2bbf998585d40a086c640688
parent46ada61ef1950eb19eae8647b5ac13adb3e14dd2
parent1655c98790682aed8892eb8a9eb6d44e00d5f69f
Merge branch 'jn/gitweb-patch' into maint

* jn/gitweb-patch:
  gitweb: Do not show 'patch' link for merge commits