diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-04-26 16:33:32 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-04-26 16:33:32 -0400 |
| commit | 8e46aa70543eb6cc003b69877e7677480db3a4dc (patch) | |
| tree | 26d21e22fdc60e180d42c31998eea9f691fc3151 /conn_tests/testconfig.ini | |
| parent | 8a22597180cd9ec672515218aed1abe3529d2104 (diff) | |
| parent | 5399fdd3a95377bfb5bba993f299664557cabb7c (diff) | |
| download | slixmpp-8e46aa70543eb6cc003b69877e7677480db3a4dc.tar.gz slixmpp-8e46aa70543eb6cc003b69877e7677480db3a4dc.tar.bz2 slixmpp-8e46aa70543eb6cc003b69877e7677480db3a4dc.tar.xz slixmpp-8e46aa70543eb6cc003b69877e7677480db3a4dc.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions