From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sat, 21 Jan 2012 03:33:27 +0000 (-0500)
Subject: Merge branch 'master' into cvs
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12fd902fb1228feb4e23a1f850f215122a4c7e3f;p=ikiwiki.git

Merge branch 'master' into cvs
---

12fd902fb1228feb4e23a1f850f215122a4c7e3f