From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Mon, 23 Jan 2012 01:50:25 +0000 (-0500)
Subject: Merge branch 'master' into cvs
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=678c240eff91c059291585ad56e6353f522677c7;p=ikiwiki.git

Merge branch 'master' into cvs
---

678c240eff91c059291585ad56e6353f522677c7