From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 20 Jul 2009 05:20:43 +0000 (+0200)
Subject: Merge branch 'master' into integration
X-Git-Tag: 3.15~149
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be30203459f6994f650ed56b9f7da88b8c98c137;p=ikiwiki.git

Merge branch 'master' into integration
---

be30203459f6994f650ed56b9f7da88b8c98c137