summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/filesocket.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-31 13:42:32 -0700
committerLance Stout <lancestout@gmail.com>2012-10-31 13:42:32 -0700
commit4b7ec4a32ac15dfa35b3282793a8317cfd32837b (patch)
tree626c0287a09b81ed5415de95f9adeb24ad42293a /sleekxmpp/xmlstream/filesocket.py
parenta00eee1bbee83b2435b09be6c4175c3649fa797b (diff)
parent2229ad8d8e51b73a7900b118dfab5d7b449f17ce (diff)
downloadslixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.tar.gz
slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.tar.bz2
slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.tar.xz
slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/filesocket.py')
0 files changed, 0 insertions, 0 deletions