]> err.no Git - dak/commit
Merge branch 'master' into dbtests
authorTorsten Werner <twerner@debian.org>
Thu, 3 Mar 2011 22:49:50 +0000 (23:49 +0100)
committerTorsten Werner <twerner@debian.org>
Thu, 3 Mar 2011 22:49:50 +0000 (23:49 +0100)
commitd86fdc088f029bb7ebfd7b1e91a178f9efdc6650
tree8eaecea790ca8d4a8a4f7ee3769fecbacc265532
parent33430ab640a257ba1227a740cbfb808bfcc94ff9
parent852d11060ffd1450a7cd02302202f19df4cb0be9
Merge branch 'master' into dbtests

Conflicts:
tests/dbtest_contents.py
tests/dbtest_contents.py