Merge branch 'master' into develop

2012-07-30 09:08:58 -07:00
parent c2189b4ecd e4b4c67637
commit 44ce01a70b
12 changed files with 135 additions and 15 deletions
--- a/sleekxmpp/plugins/init.py
+++ b/sleekxmpp/plugins/init.py
@@ -43,6 +43,7 @@ __all__ = [
    'xep_0115',  # Entity Capabilities
    'xep_0118',  # User Tune
    'xep_0128',  # Extended Service Discovery
+    'xep_0131',  # Standard Headers and Internet Metadata
    'xep_0133',  # Service Administration
    'xep_0153',  # vCard-Based Avatars
    'xep_0163',  # Personal Eventing Protocol