aboutsummaryrefslogtreecommitdiff
path: root/doc/rcs
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-01-30 14:45:29 -0400
committerJoey Hess <joey@kitenet.net>2012-01-30 14:45:29 -0400
commit0ba0d0982455297446ed777aa89d1fbf8989d2ae (patch)
tree089f0aab113a8b4c28670038286eaeb83b5ec2f2 /doc/rcs
parent01afd033cbe4d931c1354652d337f2ad456968a2 (diff)
downloadikiwiki-0ba0d0982455297446ed777aa89d1fbf8989d2ae.tar
ikiwiki-0ba0d0982455297446ed777aa89d1fbf8989d2ae.tar.gz
merged
Diffstat (limited to 'doc/rcs')
-rw-r--r--doc/rcs/cvs/discussion.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
index 2e6468dd5..e10892e7d 100644
--- 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]]