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-Tag: 3.20130212~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c6d41f92283616b15233ade70d33f0919f995a44

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

c6d41f92283616b15233ade70d33f0919f995a44