diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-11-19 18:23:26 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-11-19 18:23:26 -0800 |
| commit | b54cc97e4c1c4c6927962f4f9d5ce581b31b5408 (patch) | |
| tree | 4d08760eeca24a78f458a68182fb459e402ce612 /tests/test_stanza_roster.py | |
| parent | 429c94d6a90b6f2ae35fa158e7abe04814edd5ef (diff) | |
| parent | e3b9d5abbf8e825e6359f457b50fc51db44869ad (diff) | |
| download | slixmpp-b54cc97e4c1c4c6927962f4f9d5ce581b31b5408.tar.gz slixmpp-b54cc97e4c1c4c6927962f4f9d5ce581b31b5408.tar.bz2 slixmpp-b54cc97e4c1c4c6927962f4f9d5ce581b31b5408.tar.xz slixmpp-b54cc97e4c1c4c6927962f4f9d5ce581b31b5408.zip | |
Merge remote-tracking branch 'vijayp/master' into HEAD
Conflicts:
examples/ping.py
sleekxmpp/basexmpp.py
sleekxmpp/clientxmpp.py
sleekxmpp/features/feature_bind/bind.py
sleekxmpp/features/feature_mechanisms/mechanisms.py
sleekxmpp/plugins/gmail_notify.py
sleekxmpp/plugins/jobs.py
sleekxmpp/plugins/xep_0009/remote.py
sleekxmpp/plugins/xep_0009/rpc.py
sleekxmpp/plugins/xep_0012.py
sleekxmpp/plugins/xep_0045.py
sleekxmpp/plugins/xep_0050/adhoc.py
sleekxmpp/plugins/xep_0078/legacyauth.py
sleekxmpp/plugins/xep_0085/chat_states.py
sleekxmpp/plugins/xep_0199/ping.py
sleekxmpp/plugins/xep_0224/attention.py
sleekxmpp/xmlstream/handler/waiter.py
sleekxmpp/xmlstream/matcher/xmlmask.py
sleekxmpp/xmlstream/xmlstream.py
Conflicts:
examples/ping.py
sleekxmpp/basexmpp.py
sleekxmpp/clientxmpp.py
sleekxmpp/features/feature_bind/bind.py
sleekxmpp/features/feature_mechanisms/mechanisms.py
sleekxmpp/plugins/gmail_notify.py
sleekxmpp/plugins/jobs.py
sleekxmpp/plugins/xep_0009/remote.py
sleekxmpp/plugins/xep_0009/rpc.py
sleekxmpp/plugins/xep_0012.py
sleekxmpp/plugins/xep_0045.py
sleekxmpp/plugins/xep_0050/adhoc.py
sleekxmpp/plugins/xep_0078/legacyauth.py
sleekxmpp/plugins/xep_0085/chat_states.py
sleekxmpp/plugins/xep_0199/ping.py
sleekxmpp/plugins/xep_0224/attention.py
sleekxmpp/xmlstream/handler/waiter.py
sleekxmpp/xmlstream/matcher/xmlmask.py
sleekxmpp/xmlstream/xmlstream.py
Diffstat (limited to 'tests/test_stanza_roster.py')
0 files changed, 0 insertions, 0 deletions