From: Mark Hymers <mhy@debian.org>
Date: Thu, 24 Mar 2011 10:43:02 +0000 (+0000)
Subject: Merge remote branch 'mhy/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c6c97ebf8447d3ac7399615b028a2c9d0407c805;p=dak.git

Merge remote branch 'mhy/master' into merge

Conflicts:
	daklib/utils.py

Signed-off-by: Mark Hymers <mhy@debian.org>
---

c6c97ebf8447d3ac7399615b028a2c9d0407c805
diff --cc daklib/utils.py
index 0b2d8c87,02558deb..c0a3bdff
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@@ -39,7 -39,7 +39,7 @@@ import r
  import email as modemail
  import subprocess
  
- from dbconn import DBConn, get_architecture, get_component, get_suite, get_override_type
 -from dbconn import DBConn, get_architecture, get_component, get_suite, Keyring
++from dbconn import DBConn, get_architecture, get_component, get_suite, get_override_type, Keyring
  from dak_exceptions import *
  from textutils import fix_maintainer
  from regexes import re_html_escaping, html_escaping, re_single_line_field, \