summaryrefslogtreecommitdiff
path: root/sleekxmpp/roster/multi.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-12-27 18:05:55 -0500
committerLance Stout <lancestout@gmail.com>2011-12-27 18:05:55 -0500
commite8545dd2bc94e609079210c321a97f9e3cd75c52 (patch)
tree1b31cf621a7927c9aab3ac899e19583411818abd /sleekxmpp/roster/multi.py
parent2f2ebb37e4d1bc8b25503063d327a7d02706b3ac (diff)
parent8f9d1bcfe07f3b2302634464eed1e329b71f54ba (diff)
downloadslixmpp-e8545dd2bc94e609079210c321a97f9e3cd75c52.tar.gz
slixmpp-e8545dd2bc94e609079210c321a97f9e3cd75c52.tar.bz2
slixmpp-e8545dd2bc94e609079210c321a97f9e3cd75c52.tar.xz
slixmpp-e8545dd2bc94e609079210c321a97f9e3cd75c52.zip
Merge branch 'develop-1.1' of github.com:fritzy/SleekXMPP into develop-1.1
Diffstat (limited to 'sleekxmpp/roster/multi.py')
0 files changed, 0 insertions, 0 deletions