From: Torsten Werner Date: Mon, 21 Mar 2011 17:21:16 +0000 (+0100) Subject: Merge branch 'master' into dbtests X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c93e61298c8d126f9ceb7cdab49ae6354de74f5;p=dak Merge branch 'master' into dbtests Conflicts: dak/update_db.py Signed-off-by: Torsten Werner --- 8c93e61298c8d126f9ceb7cdab49ae6354de74f5