Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / rcs / cvs / discussion.mdwn

diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
index 2e6468dd5a8140459f1e3f219fcc9efbef249be8..e10892e7d5645c93c62bc768446c85f442c113ab 100644 (file)
--- a/doc/rcs/cvs/discussion.mdwn
+++ b/doc/rcs/cvs/discussion.mdwn
@@ -168,3 +168,5 @@ Bugs found and fixed so far:
 
 * Stop treating text files as binary (`-kb`) on `rcs_add()`
    (ac8eab29e8394aca4c0b23a6687ec947ea1ac869)
+
+> Merged to current head. --[[Joey]]