diff options
author | Lance Stout <lancestout@gmail.com> | 2012-07-23 01:52:55 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-07-23 01:52:55 -0700 |
commit | a3ec1af2053bc0be4864ae290e6e5fc39f3fd5fe (patch) | |
tree | 369937be522e219e43d7e909a2a8b9c8c3cbd3b2 /docs/api/xmlstream/filesocket.rst | |
parent | 2e580304f9d92d6d935a81cf81961323cf7fbf52 (diff) | |
parent | d571d691a7cb1f923baa82db75eb5e82845365be (diff) | |
download | slixmpp-a3ec1af2053bc0be4864ae290e6e5fc39f3fd5fe.tar.gz slixmpp-a3ec1af2053bc0be4864ae290e6e5fc39f3fd5fe.tar.bz2 slixmpp-a3ec1af2053bc0be4864ae290e6e5fc39f3fd5fe.tar.xz slixmpp-a3ec1af2053bc0be4864ae290e6e5fc39f3fd5fe.zip |
Merge branch 'master' into develop
Diffstat (limited to 'docs/api/xmlstream/filesocket.rst')
0 files changed, 0 insertions, 0 deletions