]> err.no Git - dak/commit
Merge remote branch 'drkranz/overrides' into merge
authorJoerg Jaspert <joerg@debian.org>
Tue, 11 Jan 2011 22:39:48 +0000 (23:39 +0100)
committerJoerg Jaspert <joerg@debian.org>
Tue, 11 Jan 2011 22:39:48 +0000 (23:39 +0100)
commitbe11dfd4b92f3ae0aabdb952afccb8f7a6824f9f
tree92371a3fafa2efb914e40f8a8e4b265c7b6c3379
parent5c983f83b1962e6885d01d7792dbe6f61fb7630d
parentbd2582991842aa6c77c6ccfa3923a810d4d00725
Merge remote branch 'drkranz/overrides' into merge

* drkranz/overrides:
  Avoid converting unicode strings into yaml nodes
  override.py: fix typo, spotted by Holger Levsen

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