From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 20 Jul 2009 02:47:45 +0000 (+0200)
Subject: Merge commit 'remotes/jonas/underlay-da' into integration
X-Git-Tag: 3.15~150
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e6709f6677f037097744a07cc9c3b58db4fd4595;p=ikiwiki.git

Merge commit 'remotes/jonas/underlay-da' into integration
---

e6709f6677f037097744a07cc9c3b58db4fd4595