]> err.no Git - dak/commit
Merge remote branch 'stew/contents' into merge
authorJoerg Jaspert <joerg@debian.org>
Sat, 9 Jan 2010 22:43:35 +0000 (23:43 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sat, 9 Jan 2010 22:43:35 +0000 (23:43 +0100)
commit48a1d3f8272ad4391a693b0239ff8a8853e6ce20
tree3bd9f860b7013aed5d672d3ffe9ca2fc605342a9
parent0cb5ffe4fdbcfea1fc779110281705b95ac30798
parent057cfc7863445cbdcc0abbf26f0922a6b2fbe9b7
Merge remote branch 'stew/contents' into merge

* stew/contents:
  fixes from some previous bad merge

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