diff options
author | Lance Stout <lancestout@gmail.com> | 2011-03-18 15:51:27 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-03-18 15:51:27 -0400 |
commit | f65f88325b8d76a9b44a7cb4006a0a62d061e7ef (patch) | |
tree | 3567b06b11eea8494c4212ec8b9b8f3ae2d2c6d6 /sleekxmpp/xmlstream/filesocket.py | |
parent | 42c8f6ae877535c48424e5bcb8233f5d07dcfb7d (diff) | |
parent | 996ca52471931ccb3ac5a0f661e52fdc400db64b (diff) | |
download | slixmpp-f65f88325b8d76a9b44a7cb4006a0a62d061e7ef.tar.gz slixmpp-f65f88325b8d76a9b44a7cb4006a0a62d061e7ef.tar.bz2 slixmpp-f65f88325b8d76a9b44a7cb4006a0a62d061e7ef.tar.xz slixmpp-f65f88325b8d76a9b44a7cb4006a0a62d061e7ef.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/xmlstream/filesocket.py')
0 files changed, 0 insertions, 0 deletions