From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Tue, 31 Jan 2012 01:56:51 +0000 (-0600)
Subject: Merge branch 'master' into cvs
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e752d09766da8b3ebb9ca9ba6f67be7168e63d1;p=ikiwiki.git

Merge branch 'master' into cvs
---

8e752d09766da8b3ebb9ca9ba6f67be7168e63d1