]> err.no Git - dak/commit
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)
commit0b7a883287f980e1d44e6d4fbf6050d85d1e4963
tree179cac69365d12e9d2c6a9b70443173d4756af15
parentb8657d55fc4870acbcd1684e767e2290f1b5b77e
parentf41a5c6d7f9942de65c9644abb5517034f55d425
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  try fixing up this *again*

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