From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Jan 2012 18:45:29 +0000 (-0400)
Subject: merged
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ba0d0982455297446ed777aa89d1fbf8989d2ae;p=ikiwiki.git

merged
---

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]]