diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:46:46 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:46:46 -0400 |
| commit | a269be485f2918b332c9fa3717541fc0c6c954c2 (patch) | |
| tree | 14d1783cf44e7ca5e10cb10128d84b68ed3f95e5 /conn_tests/testconfig.ini | |
| parent | e694e4a79172f0cbced79f930ca03767ce3c0792 (diff) | |
| parent | 6a07e7cbe3e995f44ca3ba75a0ff83616269cf5a (diff) | |
| download | slixmpp-a269be485f2918b332c9fa3717541fc0c6c954c2.tar.gz slixmpp-a269be485f2918b332c9fa3717541fc0c6c954c2.tar.bz2 slixmpp-a269be485f2918b332c9fa3717541fc0c6c954c2.tar.xz slixmpp-a269be485f2918b332c9fa3717541fc0c6c954c2.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions