From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Tue, 24 Jan 2012 07:40:59 +0000 (-0500)
Subject: Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
X-Git-Tag: 3.20120202~26^2~3^2~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/16572fb0b40bd09ff235991bd0ee03113a488fa3

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

16572fb0b40bd09ff235991bd0ee03113a488fa3