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-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=722953ac25a55949e974a454280e5f60c68fc33b

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

722953ac25a55949e974a454280e5f60c68fc33b