From: Joey Hess <joey@kitenet.net>
Date: Thu, 2 Feb 2012 05:11:45 +0000 (-0400)
Subject: Merge remote-tracking branch 'schmonz/cvs'
X-Git-Tag: 3.20120202~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/be1cf943a6995e744da0359ec5ad49b7260b690d?ds=sidebyside;hp=-c

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

be1cf943a6995e744da0359ec5ad49b7260b690d