Code

Merge branch 'jn/web' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2007 22:17:22 +0000 (15:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2007 22:17:22 +0000 (15:17 -0700)
* jn/web:
  gitweb: No difftree output for trivial merge
  gitweb: Remove parse_from_to_diffinfo code from git_patchset_body


Trivial merge