# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1370607784 -3600
# Node ID c968c8e3596d787ed6a9cf2432b4f686cf68ab02
# Parent  c321f1fed85142fee3d66579dd990dc3d873bc26# Parent  aa3465183b01f39cfe5cc9b5473f810360a69fe7
Merge 0.9->trunk

diff -r c321f1fed851 -r c968c8e3596d plugins/mod_bosh.lua
--- a/plugins/mod_bosh.lua	Thu Jun 06 14:48:41 2013 +0100
+++ b/plugins/mod_bosh.lua	Fri Jun 07 13:23:04 2013 +0100
@@ -324,7 +324,7 @@
 			session.log("warn", "rid too large (means a request was lost). Last rid: %d New rid: %s", session.rid, attr.rid);
 		elseif diff <= 0 then
 			-- Repeated, ignore
-			session.log("debug", "rid repeated (on request %s), ignoring: %s (diff %d)", request.id, session.rid, diff);
+			session.log("debug", "rid repeated, ignoring: %s (diff %d)", session.rid, diff);
 			context.notopen = nil;
 			context.ignore = true;
 			context.sid = sid;