summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/filesocket.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-04-08 16:52:20 -0400
committerLance Stout <lancestout@gmail.com>2011-04-08 16:52:20 -0400
commitb60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c (patch)
tree8c02fb1471a5a9f8cac686f9df1d54ca886dd821 /sleekxmpp/xmlstream/filesocket.py
parent6b0593857352c851ce2e55743802ab5fbdd81f5f (diff)
parentf02b0564e0cf664364cd6694a5df6d588071ec62 (diff)
downloadslixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.tar.gz
slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.tar.bz2
slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.tar.xz
slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.zip
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/xmlstream/filesocket.py')
0 files changed, 0 insertions, 0 deletions