From: Joey Hess Date: Thu, 2 Feb 2012 05:11:45 +0000 (-0400) Subject: Merge remote-tracking branch 'schmonz/cvs' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be1cf943a6995e744da0359ec5ad49b7260b690d;p=ikiwiki.git Merge remote-tracking branch 'schmonz/cvs' --- be1cf943a6995e744da0359ec5ad49b7260b690d