Merge branch 'master' into develop

2012-06-22 23:17:15 -07:00
parent eb5df1aa37 85ef2d8d0b
commit 5d6019a962
9 changed files with 544 additions and 56 deletions
--- a/sleekxmpp/plugins/init.py
+++ b/sleekxmpp/plugins/init.py
@@ -57,5 +57,8 @@ __all__ = [
    'xep_0224',  # Attention
    'xep_0231',  # Bits of Binary
    'xep_0249',  # Direct MUC Invitations
+    'xep_0256',  # Last Activity in Presence
    'xep_0258',  # Security Labels in XMPP
+    'xep_0270',  # XMPP Compliance Suites 2010
+    'xep_0302',  # XMPP Compliance Suites 2012
 ]