# 
# 
# patch "templates/branchchanges.html"
#  from [e7d059ec23b3f239881f19b59493eec7bc385a7f]
#    to [a8d275fa977d0714f41521f1409c3905ffe0236a]
# 
# patch "templates/branchchangesrss.html"
#  from [fd7ed725fb1c8a42dff4e9247fe8c3767229dfe0]
#    to [2be7274e1a3348545e8378190418bf00e4eab73b]
# 
# patch "viewmtn.py"
#  from [aa75b4d38d09a644bcf83927f87974231724180c]
#    to [1dc5caa196fe72d70fa67baaad7ed79f3a430868]
# 
============================================================
--- templates/branchchanges.html	e7d059ec23b3f239881f19b59493eec7bc385a7f
+++ templates/branchchanges.html	a8d275fa977d0714f41521f1409c3905ffe0236a
@@ -10,8 +10,8 @@ Changes $from_change to $to_change on th
 
 #for $revision, $diffs, $ago, $author, $changelog, $shortlog, $when in $display_revs
     <tr><td colspan="2" class="branchInfoHeader" style="">
+#filter Filter
         <strong>$ago ago: $shortlog</strong><br />
-#filter Filter
         <span style="color:black;">
             $link($revision).html("revision info") | 
             $link($revision, "browse").html("browse files")
============================================================
--- templates/branchchangesrss.html	fd7ed725fb1c8a42dff4e9247fe8c3767229dfe0
+++ templates/branchchangesrss.html	2be7274e1a3348545e8378190418bf00e4eab73b
@@ -11,10 +11,10 @@
 <item>
 #filter Filter
     <link>$link($revision).uri()</link>
+    <title>$shortlog</title>
+    <description>$changelog</description>
 #filter WebSafe
     <author>$author</author>
-    <title>$shortlog</title>
-    <description>$changelog</description>
     <pubDate>$when +0000</pubDate>
 </item>
 #end for
============================================================
--- viewmtn.py	aa75b4d38d09a644bcf83927f87974231724180c
+++ viewmtn.py	1dc5caa196fe72d70fa67baaad7ed79f3a430868
@@ -400,8 +400,8 @@ class BranchChanges:
                     elif cert[5] == 'author':
                         author = mtn.Author(cert[7])
                     elif cert[5] == 'changelog':
-                        changelog = normalise_changelog(cert[7])
-                        shortlog = quicklog(changelog)
+                        changelog = normalise_changelog(cert[7]) # NB: this HTML escapes!
+                        shortlog = quicklog(changelog) # so this is also HTML escaped.
                 if rev_branch != branch.name:
                     # yikes, fallen down a well
                     continue
@@ -413,7 +413,7 @@ class BranchChanges:
                     diffs = '| ' + ', '.join([link(d).html('diff') for d in  diffs])
                 else:
                     diffs = ''
-                rv.append((revision, diffs, ago, mtn.Author(author), '\n'.join(changelog), shortlog, when))
+                rv.append((revision, diffs, ago, mtn.Author(author), '<br />\n'.join(changelog), shortlog, when))
             return rv
         
         branch = mtn.Branch(branch)