# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1336696366 -3600
# Node ID ce793cea9f10c326773d690a79adab928c993d1d
# Parent  4905aed003826e3c985e089f95f7b40ae19eb174# Parent  82679fad3a36fd03852443e28966793055977e07
Merge with backout

diff -r 4905aed00382 -r ce793cea9f10 plugins/mod_dialback.lua
--- a/plugins/mod_dialback.lua	Thu May 10 23:37:36 2012 +0000
+++ b/plugins/mod_dialback.lua	Fri May 11 01:32:46 2012 +0100
@@ -79,9 +79,7 @@
 		local compat_check;
 		if not origin.from_host then
 			-- Just used for friendlier logging
-			origin.from_host = nameprep(attr.from);
-			-- COMPAT: Fix server's chopness by not including from
-			compat_check = true;
+			origin.from_host = attr.from;
 		end
 		if not origin.to_host then
 			-- Just used for friendlier logging