diff options
| author | Lance Stout <lance@misbehave.local> | 2011-05-25 15:53:33 -0700 |
|---|---|---|
| committer | Lance Stout <lance@misbehave.local> | 2011-05-25 15:53:33 -0700 |
| commit | ccb0eeefbd58361283e4e92d75e5d17aa76c70c7 (patch) | |
| tree | 1e099bbd9e2b6d289aafae5e1c6fe0c3d817c1ff /conn_tests/testconfig.ini | |
| parent | 9851a2a057aeee54300f703a39507713e7ad199a (diff) | |
| parent | ec9aed5b751cac187b774794c7d8ca9de298838a (diff) | |
| download | slixmpp-ccb0eeefbd58361283e4e92d75e5d17aa76c70c7.tar.gz slixmpp-ccb0eeefbd58361283e4e92d75e5d17aa76c70c7.tar.bz2 slixmpp-ccb0eeefbd58361283e4e92d75e5d17aa76c70c7.tar.xz slixmpp-ccb0eeefbd58361283e4e92d75e5d17aa76c70c7.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions