diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-05-20 21:12:53 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 21:12:53 -0400 |
| commit | 4d3593ac8698676e3b4b987120c19db07c6a76bb (patch) | |
| tree | a097c878923a5852ab602c5df3c3b770bea61582 /examples | |
| parent | c49a8e91142121251ccb2cacd3b3f0d5cd78db97 (diff) | |
| parent | 6b274a2543744f9b94823f5bd2a6c23ec8cc3f75 (diff) | |
| download | slixmpp-4d3593ac8698676e3b4b987120c19db07c6a76bb.tar.gz slixmpp-4d3593ac8698676e3b4b987120c19db07c6a76bb.tar.bz2 slixmpp-4d3593ac8698676e3b4b987120c19db07c6a76bb.tar.xz slixmpp-4d3593ac8698676e3b4b987120c19db07c6a76bb.zip | |
Merge branch 'develop' into roster
Conflicts:
tests/test_stream_roster.py
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions