From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Sep 2009 19:36:16 +0000 (-0400)
Subject: Merge commit 'schmonz/master' into cvs
X-Git-Tag: 3.14159265~80
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb2697ca5e39bc40a18aa01582087cc5c558442e;p=ikiwiki.git

Merge commit 'schmonz/master' into cvs
---

bb2697ca5e39bc40a18aa01582087cc5c558442e