]> err.no Git - dak/commit
Merge commit 'lamby/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Thu, 29 Oct 2009 18:59:41 +0000 (19:59 +0100)
committerJoerg Jaspert <joerg@debian.org>
Thu, 29 Oct 2009 18:59:41 +0000 (19:59 +0100)
commitad2dbd4d938f0fb08b82b883fca05541edb9b0a9
tree8522ee275d9e4f93051d0a5a55aa720c70209780
parentd0488f18ee1516e62e4eb1ad673520f7e2516755
parent0cae38077922be67a896bf99c57274b9467c1592
Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  cnf.__getitem__ is not following protocol, but this is an easier fix.

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