Merge branch 'master' into develop

2012-09-25 02:45:48 -07:00
parent d385b9e708 671f680bb3
commit 73ce9a5ecc
12 changed files with 289 additions and 41 deletions
--- a/sleekxmpp/plugins/init.py
+++ b/sleekxmpp/plugins/init.py
@@ -69,5 +69,7 @@ __all__ = [
    'xep_0258',  # Security Labels in XMPP
    'xep_0270',  # XMPP Compliance Suites 2010
    'xep_0279',  # Server IP Check
+    'xep_0280',  # Message Carbons
+    'xep_0297',  # Stanza Forwarding
    'xep_0302',  # XMPP Compliance Suites 2012
 ]