From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 8 Sep 2008 15:51:25 +0000 (-0400)
Subject: Merge commit 'origin/debian-testing' into debian-testing
X-Git-Tag: 2.53.2~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e582f18f794ac5c419b0cef788b5a17623eb4bac

Merge commit 'origin/debian-testing' into debian-testing
---

e582f18f794ac5c419b0cef788b5a17623eb4bac