diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-02-02 09:13:22 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-02-02 09:13:22 -0500 |
| commit | de6170a13de2dbb3cbcfbf4a74b749f20b0cf061 (patch) | |
| tree | b60043234119a3d215e0eca65913dd038167b551 /conn_tests/testconfig.ini | |
| parent | 65931bb384aada922c5287a3ad3cc62d04d6e676 (diff) | |
| parent | 8dbe6f65462ec9b1a0506a00316415996f4d53d8 (diff) | |
| download | slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.gz slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.bz2 slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.xz slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.zip | |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/basexmpp.py
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions