From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Tue, 7 Feb 2012 13:33:35 +0000 (-0500)
Subject: Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
X-Git-Tag: 3.20130212~7^2~5^2~4
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a42de69fbb3e775dd407d24bf90534a07219710a

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

a42de69fbb3e775dd407d24bf90534a07219710a