cvs: Various fixes.

diff --git a/debian/changelog b/debian/changelog
index 44bf981124881340f6afe5baa423968945efd330..4e396e60f54829737dc5d4751e330c96567d4b31 100644 (file)
--- 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 e3d3e263d837f03f74bd8d19909e5def360aa087..57b0d044b513788658652a7133486e4be3282c2d 100644 (file)
--- 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]]