diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-12-13 09:38:27 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-12-13 09:38:27 -0800 |
| commit | dcb0d8b00ec9d81f75b9b7f2cbd8fb785eafa507 (patch) | |
| tree | 3a54ea344ee245318f954738a03dd573010fbd75 /sleekxmpp/xmlstream/filesocket.py | |
| parent | cb635dcd5ab94a1cbc104788b33abefea12d0040 (diff) | |
| parent | 116bb6e1b9e5c9d067b2a522d595eaa75e31be6b (diff) | |
| download | slixmpp-dcb0d8b00ec9d81f75b9b7f2cbd8fb785eafa507.tar.gz slixmpp-dcb0d8b00ec9d81f75b9b7f2cbd8fb785eafa507.tar.bz2 slixmpp-dcb0d8b00ec9d81f75b9b7f2cbd8fb785eafa507.tar.xz slixmpp-dcb0d8b00ec9d81f75b9b7f2cbd8fb785eafa507.zip | |
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'sleekxmpp/xmlstream/filesocket.py')
0 files changed, 0 insertions, 0 deletions