Merge remote branch 'fritzy/master'

Conflicts:
	sleekxmpp/__init__.py
	sleekxmpp/basexmpp.py
	sleekxmpp/stanza/error.py

sleekxmpp/__init__.py

@@ -116,8 +116,7 @@ class ClientXMPP(basexmpp, XMLStream):
 			else:
 				logging.debug("Since no address is supplied, attempting SRV lookup.")
 				try:
-					answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.domain, 
-							dns.rdatatype.SRV )
+					answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.server, dns.rdatatype.SRV)
 				except dns.resolver.NXDOMAIN:
 					logging.debug("No appropriate SRV record found.  Using JID server name.")
 				else:
@@ -335,4 +334,4 @@ def md5digest(data):
 	except ImportError:
 		import md5
 		md5 = md5.new(data)
-	return md5.hexdigest()
+	return md5.hexdigest()