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/componentxmpp.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/componentxmpp.py')
0 files changed, 0 insertions, 0 deletions