]> err.no Git - dak/commit
Merge commit 'mhy/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 15:03:55 +0000 (16:03 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 15:03:55 +0000 (16:03 +0100)
commit84e2afd2b02875e9d28f83426ac8c1dbaf90b120
tree2e8dc8c6f876a0b94ae26a8368d3a000219d90d3
parentf40b8bfec79077b5c7a5bf0b78af03dba815cbad
parentefa1b13e55848306d5e3b1f27d6c56a708d58f70
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  hack around file hanging around forever

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