diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-01-09 10:04:09 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-01-09 10:04:09 -0500 |
| commit | 23e499998fc36b377e3adb77d3d59f885d94f21d (patch) | |
| tree | 3dcef998633c65ea320cd2acfdaadb394e4ee773 /conn_tests/testconfig.ini | |
| parent | c156a4f723073e1e6394803b5bb1613227947266 (diff) | |
| parent | acdf9e2d22dd604578f50d0a9b67c47e001da69f (diff) | |
| download | slixmpp-23e499998fc36b377e3adb77d3d59f885d94f21d.tar.gz slixmpp-23e499998fc36b377e3adb77d3d59f885d94f21d.tar.bz2 slixmpp-23e499998fc36b377e3adb77d3d59f885d94f21d.tar.xz slixmpp-23e499998fc36b377e3adb77d3d59f885d94f21d.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions