chiark / gitweb /
Merge branch 'master' into refs/top-bases/debian/locations
authormartin f. krafft <madduck@debian.org>
Wed, 19 Nov 2008 16:49:09 +0000 (17:49 +0100)
committermartin f. krafft <madduck@debian.org>
Wed, 19 Nov 2008 16:49:09 +0000 (17:49 +0100)
commit56820360e98daea1219b46401e5c67d38e35c2dd
tree3da69259fb327d745e15bfd1d4b5634b3f85cb57
parentd1ecd86b76b648acd42e9893b276f63f9ff5a5ad
parent4c2930197ce83ebd68193a6056990e42a9d98daf
Merge branch 'master' into refs/top-bases/debian/locations