diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-04-11 14:23:39 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-04-11 14:23:39 -0400 |
| commit | b9bf30e095da565f02f3ed20dab6b378dba4ab7d (patch) | |
| tree | f7b159873f15624ed047c3eaf6c7c8246ec99f48 /conn_tests/testconfig.ini | |
| parent | b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c (diff) | |
| parent | 1d891858b63c1e3ac10a39920c3e65159cfc8d72 (diff) | |
| download | slixmpp-b9bf30e095da565f02f3ed20dab6b378dba4ab7d.tar.gz slixmpp-b9bf30e095da565f02f3ed20dab6b378dba4ab7d.tar.bz2 slixmpp-b9bf30e095da565f02f3ed20dab6b378dba4ab7d.tar.xz slixmpp-b9bf30e095da565f02f3ed20dab6b378dba4ab7d.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions