summaryrefslogtreecommitdiff
path: root/sleekxmpp/test/livesocket.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-02 09:51:24 -0700
committerLance Stout <lancestout@gmail.com>2012-10-02 09:51:24 -0700
commit84a2fc382b88133ce2398b1fac8c92196ddeb8dd (patch)
tree22cc58f559341acfdac0800cfe0592eb930b7ceb /sleekxmpp/test/livesocket.py
parent44e7585bf8c7715eb0eaf348976b4c0fc0568722 (diff)
parent098714b3c40af20b09cafee4bb09c0fa64c6cb00 (diff)
downloadslixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.tar.gz
slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.tar.bz2
slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.tar.xz
slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/test/livesocket.py')
0 files changed, 0 insertions, 0 deletions