chiark / gitweb /
Merge branch 'master' into refs/top-bases/debian/locations
authormartin f. krafft <madduck@debian.org>
Mon, 17 Nov 2008 21:53:41 +0000 (22:53 +0100)
committermartin f. krafft <madduck@debian.org>
Mon, 17 Nov 2008 21:53:41 +0000 (22:53 +0100)
commitd1ecd86b76b648acd42e9893b276f63f9ff5a5ad
treed5f1858deb30b7c67674f5a464b6d1a69a4133db
parent41ad0fd31729461c5c9c3926c28011770ccfc9e7
parenteb163057f4e4145a75141c76f1f387ba28958383
Merge branch 'master' into refs/top-bases/debian/locations