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

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

Conflicts:
	TODO.cvs
---