chiark / gitweb /
Merge branch 'master' into refs/top-bases/debian/locations
authormartin f. krafft <madduck@debian.org>
Sun, 14 Sep 2008 22:20:27 +0000 (23:20 +0100)
committermartin f. krafft <madduck@debian.org>
Sun, 14 Sep 2008 22:20:27 +0000 (23:20 +0100)
commit643328644f50c39690341b8bc2b27aea329576f9
treeac19fb7e4d31b5978dca8d87bcb72f81bb2acbf9
parentb8ce1c261c6985c17af7f6ae7894894214ce44ea
parent7252cb7b2290ee4317cb511e6ecfac614a219554
Merge branch 'master' into refs/top-bases/debian/locations