From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sun, 22 Jan 2012 16:18:07 +0000 (-0500)
Subject: Merge branch 'master' into cvs
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a64b224f524bcef95fc3befeb3e66a854f9e3bff;p=ikiwiki.git

Merge branch 'master' into cvs
---

a64b224f524bcef95fc3befeb3e66a854f9e3bff