]> git.decadent.org.uk Git - dak.git/commitdiff
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)
* 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>

Trivial merge