From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 29 Sep 2008 22:11:32 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Tag: 2.66~34^2~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=799bcbcd477653ff49aaee2e49818b62e40b6724;p=ikiwiki.git

Merge branch 'master' into tova
---

799bcbcd477653ff49aaee2e49818b62e40b6724