diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:26:23 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:26:23 -0500 |
| commit | d5b3a5282763e4f74816ff392bd8cd47dd9f7a95 (patch) | |
| tree | 10b421c0cf9cf47997162485f35dabdccfffab69 /sleekxmpp/plugins/xep_0199/__init__.py | |
| parent | 1a270dc05cc368000f3545975befa0589031b684 (diff) | |
| parent | d709f8db657aa1d1314082d842dd29e2546739c4 (diff) | |
| download | slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.tar.gz slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.tar.bz2 slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.tar.xz slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.zip | |
Merge branch 'develop' into stream_features
Conflicts:
sleekxmpp/xmlstream/stanzabase.py
Diffstat (limited to 'sleekxmpp/plugins/xep_0199/__init__.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0199/__init__.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sleekxmpp/plugins/xep_0199/__init__.py b/sleekxmpp/plugins/xep_0199/__init__.py new file mode 100644 index 00000000..3444fe94 --- /dev/null +++ b/sleekxmpp/plugins/xep_0199/__init__.py @@ -0,0 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file LICENSE for copying permission. +""" + +from sleekxmpp.plugins.xep_0199.stanza import Ping +from sleekxmpp.plugins.xep_0199.ping import xep_0199 |