]> err.no Git - dak/commit
Merge remote branch 'bdefreese/override' into merge
authorJoerg Jaspert <joerg@debian.org>
Tue, 24 Nov 2009 08:12:11 +0000 (09:12 +0100)
committerJoerg Jaspert <joerg@debian.org>
Tue, 24 Nov 2009 08:12:11 +0000 (09:12 +0100)
commit2914f340f45c89d3ef55cf70c96369056ff2259f
treea10200447a0cd37728bf7ba7ae1f6953e39ac2fc
parent960d55b823f504336949d3b54c8b400d564ec4d2
parentc89c97e5d1c9aa97eaa3f3e4f54c02eda2725674
Merge remote branch 'bdefreese/override' into merge

* bdefreese/override:
  Cnf[...] changed to cnf[...] in override.py

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