]> git.donarmstrong.com Git - dak.git/commitdiff
Merge commit 'mhy/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 13:39:23 +0000 (14:39 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 13:39:23 +0000 (14:39 +0100)
* commit 'mhy/master':
  another merge failure

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

Trivial merge