# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1298592494 0
# Node ID 25ce18c934173e30437f6563a647d953871e54c8
# Parent  c88f646a34d35dcc4dac3d2e3e6381770b29ecfd# Parent  06eb75d071ec6317facfd8df8aa71f4d58dbe71e
Merge 0.8->trunk

diff -r c88f646a34d3 -r 25ce18c93417 plugins/mod_pep.lua
--- a/plugins/mod_pep.lua	Thu Feb 24 18:20:05 2011 +0000
+++ b/plugins/mod_pep.lua	Fri Feb 25 00:08:14 2011 +0000
@@ -124,7 +124,7 @@
 			local recipient = stanza.attr.from;
 			local current = recipients[user] and recipients[user][recipient];
 			local hash = get_caps_hash_from_presence(stanza, current);
-			if current == hash then return; end
+			if current == hash or (current and current == hash_map[hash]) then return; end
 			if not hash then
 				if recipients[user] then recipients[user][recipient] = nil; end
 			else