chiark / gitweb /
Merge branch 'master' into refs/top-bases/debian/locations
authormartin f. krafft <madduck@madduck.net>
Fri, 26 Sep 2008 18:06:01 +0000 (20:06 +0200)
committermartin f. krafft <madduck@madduck.net>
Fri, 26 Sep 2008 18:06:01 +0000 (20:06 +0200)
commit41ad0fd31729461c5c9c3926c28011770ccfc9e7
tree4dd985d3cee36fb7969163d069e25218b0c1eeba
parent643328644f50c39690341b8bc2b27aea329576f9
parentcd10b605b0e442f52837bb1d6e0ffbde83ffcab0
Merge branch 'master' into refs/top-bases/debian/locations