diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-12-14 09:37:45 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-12-14 09:37:45 -0800 |
| commit | f431bbfca2b9862f954e25d7dd234a9131bc2ee1 (patch) | |
| tree | 2d82e0a0a8fc3017cb60b9280e79847c6c50446b /docs/api/xmlstream/filesocket.rst | |
| parent | 6f8a4f83549ab1716ddca55c05518f3867eb9213 (diff) | |
| parent | 8b29900be459dffcb32a9fc106caebbbf93e5b33 (diff) | |
| download | slixmpp-f431bbfca2b9862f954e25d7dd234a9131bc2ee1.tar.gz slixmpp-f431bbfca2b9862f954e25d7dd234a9131bc2ee1.tar.bz2 slixmpp-f431bbfca2b9862f954e25d7dd234a9131bc2ee1.tar.xz slixmpp-f431bbfca2b9862f954e25d7dd234a9131bc2ee1.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/api/xmlstream/filesocket.rst')
0 files changed, 0 insertions, 0 deletions