summaryrefslogtreecommitdiff
path: root/sleekxmpp/test/livesocket.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-07-20 00:25:32 -0700
committerLance Stout <lancestout@gmail.com>2012-07-20 00:25:32 -0700
commit060c9ab6794cbe6c62c312b1f42bd3767ff66b80 (patch)
tree4802e7d13643dc4546e44bdd2e135dd9ad73b34c /sleekxmpp/test/livesocket.py
parent78f03253983779673beaf3c102ae315707a49d2c (diff)
parentacd9c32a9f8ba5476ac238a7536c838789ed4ab5 (diff)
downloadslixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.tar.gz
slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.tar.bz2
slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.tar.xz
slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/test/livesocket.py')
0 files changed, 0 insertions, 0 deletions