# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1377382568 -3600
# Node ID 11b6157ee274524f461abd9a05ab7cf52968f446
# Parent  5b79710dd5a1e749d71ee35c92a398c7a6ac131a# Parent  bb27ba619932d3af5dcf22a042d7b033d868a39e
Merge 0.9->trunk

diff -r 5b79710dd5a1 -r 11b6157ee274 .hgtags
--- a/.hgtags	Wed Aug 14 15:38:56 2013 +0200
+++ b/.hgtags	Sat Aug 24 23:16:08 2013 +0100
@@ -45,3 +45,4 @@
 aa905291a66c7d8168b1cb912bb173e6478dac05 0.8.1
 3421dfaa81880201e9ade8b4eee727ade9a9ce33 0.8.1
 44b131d7041ba40ff2cab6519d1543d33ff679a4 0.8.2
+6ef79af0c4455851ae45fa4da1033ba2cccada88 0.9.0
diff -r 5b79710dd5a1 -r 11b6157ee274 plugins/mod_pep.lua
--- a/plugins/mod_pep.lua	Wed Aug 14 15:38:56 2013 +0200
+++ b/plugins/mod_pep.lua	Sat Aug 24 23:16:08 2013 +0100
@@ -135,7 +135,7 @@
 					recipients[user][recipient] = hash;
 					local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host;
 					if self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then
-						-- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute
+						-- COMPAT from ~= stanza.attr.to because OneTeam and Asterisk 1.8 can't deal with missing from attribute
 						origin.send(
 							st.stanza("iq", {from=user, to=stanza.attr.from, id="disco", type="get"})
 								:query("http://jabber.org/protocol/disco#info")