diff options
author | Lance Stout <lancestout@gmail.com> | 2011-08-30 23:11:11 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-08-30 23:11:11 -0700 |
commit | 628978fc8c08a45804983b1888f7dbea583d6a28 (patch) | |
tree | 6d1de90bbd09ee546ca76a16bce6b3e439131001 /conn_tests/testconfig.ini | |
parent | e0a1c477d03ab353107cd8cf5bb420edc2262a97 (diff) | |
parent | 7fb9d6871407380496e3beb193d4b7c269fcf035 (diff) | |
download | slixmpp-628978fc8c08a45804983b1888f7dbea583d6a28.tar.gz slixmpp-628978fc8c08a45804983b1888f7dbea583d6a28.tar.bz2 slixmpp-628978fc8c08a45804983b1888f7dbea583d6a28.tar.xz slixmpp-628978fc8c08a45804983b1888f7dbea583d6a28.zip |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions