From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 29 Sep 2009 17:35:41 +0000 (-0400)
Subject: Merge commit 'origin/master'
X-Git-Tag: 3.20091009~91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d9976060be0a0f84120d9edfc8966dc986f2b55;p=ikiwiki.git

Merge commit 'origin/master'
---

4d9976060be0a0f84120d9edfc8966dc986f2b55