diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-07-03 00:39:02 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-07-03 00:39:02 -0700 |
| commit | 48fb7006f75dd03caa23f61cb512f9002fe91b90 (patch) | |
| tree | bbaea934492ba83c0a7e40b9c7d798f3743e37e5 /conn_tests/testconfig.ini | |
| parent | 7057984831b2a96980871476686273f8591f8101 (diff) | |
| parent | 086bf89d699c88ab89ad1e1975d6022335ca5c04 (diff) | |
| download | slixmpp-48fb7006f75dd03caa23f61cb512f9002fe91b90.tar.gz slixmpp-48fb7006f75dd03caa23f61cb512f9002fe91b90.tar.bz2 slixmpp-48fb7006f75dd03caa23f61cb512f9002fe91b90.tar.xz slixmpp-48fb7006f75dd03caa23f61cb512f9002fe91b90.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions