diff options
author | Lance Stout <lancestout@gmail.com> | 2011-08-04 11:52:17 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-08-04 11:52:17 -0700 |
commit | 89cffd43f48cfc835b70e137776eb8c2e73a0b67 (patch) | |
tree | 088035aeb688edc6a0f5675de31eedf169f87fd3 /sleekxmpp/features/feature_bind/__init__.py | |
parent | ad978700fc891602c826dea03615c396f39364a0 (diff) | |
parent | b9764cc120c48576be1fe6cadb11813d12f91f4c (diff) | |
download | slixmpp-89cffd43f48cfc835b70e137776eb8c2e73a0b67.tar.gz slixmpp-89cffd43f48cfc835b70e137776eb8c2e73a0b67.tar.bz2 slixmpp-89cffd43f48cfc835b70e137776eb8c2e73a0b67.tar.xz slixmpp-89cffd43f48cfc835b70e137776eb8c2e73a0b67.zip |
Merge branch 'develop' into roster
Conflicts:
setup.py
Diffstat (limited to 'sleekxmpp/features/feature_bind/__init__.py')
-rw-r--r-- | sleekxmpp/features/feature_bind/__init__.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sleekxmpp/features/feature_bind/__init__.py b/sleekxmpp/features/feature_bind/__init__.py new file mode 100644 index 00000000..aa854f87 --- /dev/null +++ b/sleekxmpp/features/feature_bind/__init__.py @@ -0,0 +1,10 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2011 Nathanael C. Fritz + This file is part of SleekXMPP. + + See the file LICENSE for copying permission. +""" + +from sleekxmpp.features.feature_bind.bind import feature_bind +from sleekxmpp.features.feature_bind.stanza import Bind |