diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-02 09:51:24 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-02 09:51:24 -0700 |
| commit | 84a2fc382b88133ce2398b1fac8c92196ddeb8dd (patch) | |
| tree | 22cc58f559341acfdac0800cfe0592eb930b7ceb /sleekxmpp/test/livesocket.py | |
| parent | 44e7585bf8c7715eb0eaf348976b4c0fc0568722 (diff) | |
| parent | 098714b3c40af20b09cafee4bb09c0fa64c6cb00 (diff) | |
| download | slixmpp-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