From: martin f. krafft <madduck@madduck.net>
Date: Fri, 26 Sep 2008 18:06:01 +0000 (+0200)
Subject: Merge branch 'master' into refs/top-bases/debian/locations
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=41ad0fd31729461c5c9c3926c28011770ccfc9e7;p=topgit.git

Merge branch 'master' into refs/top-bases/debian/locations
---

41ad0fd31729461c5c9c3926c28011770ccfc9e7