diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-03-24 13:15:09 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-03-24 13:15:09 -0400 |
| commit | f125c11a810cf308473394262879f94166c3f564 (patch) | |
| tree | 313a8b6c84bc637640efd8545ae6f4d09c19637c /conn_tests/testconfig.ini | |
| parent | bf2f2782b7b64be97948f56e21d55b969072c4dc (diff) | |
| parent | d94811d81d68d948155d42ff9096c23ccb90a73c (diff) | |
| download | slixmpp-f125c11a810cf308473394262879f94166c3f564.tar.gz slixmpp-f125c11a810cf308473394262879f94166c3f564.tar.bz2 slixmpp-f125c11a810cf308473394262879f94166c3f564.tar.xz slixmpp-f125c11a810cf308473394262879f94166c3f564.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions