]> git.decadent.org.uk Git - dak.git/commitdiff
Merge commit 'mhy/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 18:18:46 +0000 (19:18 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 18:18:46 +0000 (19:18 +0100)
* commit 'mhy/master':
  try fixing up this *again*

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Trivial merge