]> err.no Git - dak/commit
Merge commit 'mhy/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 13:34:18 +0000 (14:34 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 13:34:18 +0000 (14:34 +0100)
commit776229f5bed50af6c2432f188c1131b5ef05185c
treebc637261a81977265bd0841205c69a9888655d5b
parent21e5bac6ffc3eca9587997822ed48f3e6093241a
parent82e7652a8c069e61409faacf61922c93cec2e789
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  fix bad merge

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