From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 22 Jul 2009 22:37:22 +0000 (+0200)
Subject: Merge commit 'jonas/master'
X-Git-Tag: 3.15~114^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44e72fab1db7e2a5b7419dea93a25793b27df951;p=ikiwiki.git

Merge commit 'jonas/master'
---

44e72fab1db7e2a5b7419dea93a25793b27df951