From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 25 Jul 2008 16:03:34 +0000 (-0400)
Subject: Merge commit 'jelmer/master'
X-Git-Tag: 2.55~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c401cf4f0ccdf3817fdedc7b0cff5801286dc9bf;p=ikiwiki.git

Merge commit 'jelmer/master'
---

c401cf4f0ccdf3817fdedc7b0cff5801286dc9bf