]> err.no Git - dak/commit
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)
commita13bb1a6f59fe5f497b125da3764da72081a7ab2
tree9756f567ea7814bf9313586e2cb3c06de608cf97
parent776229f5bed50af6c2432f188c1131b5ef05185c
parent4f388f061e9e266474ba4a91c54e27e6b0907855
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  another merge failure

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