]> err.no Git - dak/commit
Merge remote branch 'stew/contents' into merge
authorJoerg Jaspert <joerg@debian.org>
Sun, 10 Jan 2010 00:01:27 +0000 (01:01 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sun, 10 Jan 2010 00:01:27 +0000 (01:01 +0100)
commit2d8c51ff9eb9d3eb3f0d5245488095789d79b047
tree66c0ae7deb139aacc630bd238aee9d21f31686cd
parentda50ffea8352d361c43d2e5534d789f8c5caae36
parentae3c907fc2a56d198d0a00c082f242d988eddde5
Merge remote branch 'stew/contents' into merge

* stew/contents:
  o.type -> ot.type

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