summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/filesocket.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-02 17:05:35 -0800
committerLance Stout <lancestout@gmail.com>2013-01-02 17:05:35 -0800
commitef76f923ad885d8faa67e88d76704cbe8253b153 (patch)
tree4fc443614e3551daad8ea174b515ca5037497c8c /sleekxmpp/xmlstream/filesocket.py
parent0e2abe74d5d978ee701576d6e00eb35919dffb70 (diff)
parent2c04ae084ca2233f45776b32614b1e575db93449 (diff)
downloadslixmpp-ef76f923ad885d8faa67e88d76704cbe8253b153.tar.gz
slixmpp-ef76f923ad885d8faa67e88d76704cbe8253b153.tar.bz2
slixmpp-ef76f923ad885d8faa67e88d76704cbe8253b153.tar.xz
slixmpp-ef76f923ad885d8faa67e88d76704cbe8253b153.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/filesocket.py')
0 files changed, 0 insertions, 0 deletions