diff options
author | Lance Stout <lancestout@gmail.com> | 2011-04-08 16:41:45 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-04-08 16:41:45 -0400 |
commit | 6b0593857352c851ce2e55743802ab5fbdd81f5f (patch) | |
tree | 6decf0c5a752eb498044fca2c034dd57418024f2 /sleekxmpp/xmlstream/filesocket.py | |
parent | 77601f7262370ba172966352a94575ec02b4a776 (diff) | |
parent | 2e1befc8c6e3092b773a8c297bc183823c2eaeed (diff) | |
download | slixmpp-6b0593857352c851ce2e55743802ab5fbdd81f5f.tar.gz slixmpp-6b0593857352c851ce2e55743802ab5fbdd81f5f.tar.bz2 slixmpp-6b0593857352c851ce2e55743802ab5fbdd81f5f.tar.xz slixmpp-6b0593857352c851ce2e55743802ab5fbdd81f5f.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/xmlstream/filesocket.py')
0 files changed, 0 insertions, 0 deletions