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)

Trivial merge