From: Joey Hess <joey@kitenet.net>
Date: Sat, 2 Feb 2013 23:40:34 +0000 (+1100)
Subject: cvs: Various fixes.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/ba3494978be2502e3727959717fdd385b8c64f1f

cvs: Various fixes.
---

diff --git a/debian/changelog b/debian/changelog
index 44bf98112..4e396e60f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20121213) UNRELEASED; urgency=low
   * trail: Avoid massive slowdown caused by pagetemplate hook when displaying
     dynamic cgi pages, which cannot use trail anyway.
   * Deal with empty diffurl in configuration.
+  * cvs: Various fixes.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2012 16:15:24 -0400
 
diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
index e3d3e263d..57b0d044b 100644
--- a/doc/rcs/cvs/discussion.mdwn
+++ b/doc/rcs/cvs/discussion.mdwn
@@ -187,3 +187,5 @@ Hi! Bugfixes in `schmonz/cvs` I'd like to see merged:
 These are all the diffs that exist on the branch, so if the changes
 are acceptable you should be able to simply merge the branch.
 --[[schmonz]]
+
+> All applied. --[[Joey]]