Merge branch 'develop'

2013-02-10 11:29:57 -08:00
parent 75a792eb6f b0fed5a48d
commit da3223ac92
10 changed files with 723 additions and 8 deletions
--- a/sleekxmpp/plugins/init.py
+++ b/sleekxmpp/plugins/init.py
@@ -28,6 +28,7 @@ __all__ = [
    'xep_0054',  # vcard-temp
    'xep_0059',  # Result Set Management
    'xep_0060',  # Pubsub (Client)
+    'xep_0065',  # SOCKS5 Bytestreams
    'xep_0066',  # Out of Band Data
    'xep_0071',  # XHTML-IM
    'xep_0077',  # In-Band Registration