From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 25 Jan 2012 05:43:07 +0000 (-0500)
Subject: Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
X-Git-Tag: 3.20120202~26^2~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/722953ac25a55949e974a454280e5f60c68fc33b?hp=1b73015251ac81cbcca64289470ca14e80d8e66a

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