# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1244803054 -3600
# Node ID 7d77f92f94c91f02febb4978a996421b3f64720e
# Parent  0bfc8d8664790efd9bf9c0ec46d9719d816144f1# Parent  16c5aa4696ca9d26332b731397a04124332e4712
Automated merge with http://waqas.ath.cx:8000/

diff -r 0bfc8d866479 -r 7d77f92f94c9 plugins/mod_dialback.lua
--- a/plugins/mod_dialback.lua	Fri Jun 12 15:33:41 2009 +0500
+++ b/plugins/mod_dialback.lua	Fri Jun 12 11:37:34 2009 +0100
@@ -26,7 +26,7 @@
 		-- We are being asked to verify the key, to ensure it was generated by us
 		origin.log("debug", "verifying that dialback key is ours...");
 		local attr = stanza.attr;
-		-- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
+		-- COMPAT: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
 		--if attr.from ~= origin.to_host then error("invalid-from"); end
 		local type;
 		if s2s_verify_dialback(attr.id, attr.from, attr.to, stanza[1]) then