Merge branch 'master' into develop

This commit is contained in:
Lance Stout
2012-07-20 18:15:54 -07:00
3 changed files with 205 additions and 0 deletions

View File

@@ -106,6 +106,7 @@ class XEP_0153(BasePlugin):
return
elif data == '' or data != self.api['get_hash'](pres['to']):
self._reset_hash(pres['from'])
self.xmpp.event('vcard_avatar_update', pres)
# =================================================================