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

Merge commit 'jelmer/master'
---

11872cecfcf40a4f68677a82b0d2db7c8e24dd71