From: Joey Hess <joey@kitenet.net>
Date: Sat, 2 Feb 2013 23:39:25 +0000 (+1100)
Subject: Merge remote-tracking branch 'schmonz/cvs'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/c6d41f92283616b15233ade70d33f0919f995a44?hp=-c

Merge remote-tracking branch 'schmonz/cvs'
---

c6d41f92283616b15233ade70d33f0919f995a44