diff options
author | Lance Stout <lancestout@gmail.com> | 2011-07-03 00:39:14 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-07-03 00:39:14 -0700 |
commit | 20df6348a4c8262a40578d84c934f9a15431d925 (patch) | |
tree | c6dc62a271c0125bf623a2376cc64c08e00ae7ad /sleekxmpp/xmlstream/filesocket.py | |
parent | 847510c6b577f889cdba5deaa0bb271475cc7c7f (diff) | |
parent | 086bf89d699c88ab89ad1e1975d6022335ca5c04 (diff) | |
download | slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.tar.gz slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.tar.bz2 slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.tar.xz slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.zip |
Merge branch 'develop' into exceptions
Diffstat (limited to 'sleekxmpp/xmlstream/filesocket.py')
0 files changed, 0 insertions, 0 deletions