chiark / gitweb /
Merge branch 'master' into refs/top-bases/debian/locations
authormartin f. krafft <madduck@debian.org>
Wed, 10 Sep 2008 08:33:28 +0000 (09:33 +0100)
committermartin f. krafft <madduck@debian.org>
Wed, 10 Sep 2008 08:33:28 +0000 (09:33 +0100)
commitb8ce1c261c6985c17af7f6ae7894894214ce44ea
tree3400fd96d7abe5bd489f8b7dd1271aca60abe790
parent4c8ab25482e6f47878090d87a295eba50d04a564
parentfbc841b7daa7c626fa2bd894a51e3711493b6410
Merge branch 'master' into refs/top-bases/debian/locations