]> git.decadent.org.uk Git - dak.git/commitdiff
Merge commit 'mhy/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 14:42:26 +0000 (15:42 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 14:42:26 +0000 (15:42 +0100)
* commit 'mhy/master':
  and again...

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

Trivial merge