From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sun, 22 Jan 2012 15:53:45 +0000 (-0500)
Subject: Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
X-Git-Tag: 3.20120202~26^2~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c74571c7582b7ce3111841a0229f84f7059711aa?hp=c1bbff4bfbccada1911c68ad8a43876440015974

Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs

Conflicts:
	TODO.cvs
	t/cvs.t
---