From 105a809feb04dd1c965aaed406da95be21aa8ed9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 21 Aug 2008 14:14:00 -0700
Subject: [PATCH] Fix Changelog generation

---
 src/calibre/trac/plugins/Changelog.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/trac/plugins/Changelog.py b/src/calibre/trac/plugins/Changelog.py
index ff15329859..04cc242d16 100644
--- a/src/calibre/trac/plugins/Changelog.py
+++ b/src/calibre/trac/plugins/Changelog.py
@@ -17,6 +17,7 @@ BZR_PATH = '/var/bzr/code/calibre/trunk'
 class ChangelogFormatter(blog.LogFormatter):
     
     supports_tags = True
+    supports_merge_revisions = True
     
     def __init__(self, num_of_versions=20):
         self.num_of_versions = num_of_versions