diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-01-16 22:33:05 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-01-16 22:33:05 -0800 |
| commit | 01da222d67858ac82951a0a3b01670ea201abd9c (patch) | |
| tree | 384c743f69b711c192b2f435be4f2dbe7cb116a8 /sleekxmpp/xmlstream/filesocket.py | |
| parent | 1dbfa29a1ebb9becb93911b33f026cc1a7a7faee (diff) | |
| parent | 518eee05c224b00cf4622038290f5fb0c0d4e95b (diff) | |
| download | slixmpp-01da222d67858ac82951a0a3b01670ea201abd9c.tar.gz slixmpp-01da222d67858ac82951a0a3b01670ea201abd9c.tar.bz2 slixmpp-01da222d67858ac82951a0a3b01670ea201abd9c.tar.xz slixmpp-01da222d67858ac82951a0a3b01670ea201abd9c.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/filesocket.py')
0 files changed, 0 insertions, 0 deletions