From: Joey Hess <joey@kitenet.net>
Date: Sun, 5 Dec 2010 20:39:06 +0000 (-0400)
Subject: Merge remote branch 'origin/debian-testing' into debian-testing
X-Git-Tag: 3.20100815.5~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cb385d4de86ffa948a569f4aee677a875fb8d0a8

Merge remote branch 'origin/debian-testing' into debian-testing
---

cb385d4de86ffa948a569f4aee677a875fb8d0a8