diff options
author | Lance Stout <lancestout@gmail.com> | 2010-12-21 11:33:40 -0500 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2010-12-21 11:33:40 -0500 |
commit | 3657bf66363844bf7351ea84279eeb74b0449d5f (patch) | |
tree | e3a89300ae19a3b9f78596f42a05a5926e3ddc1f /conn_tests | |
parent | adade2e5eccf5a0c48b0b6541fc3d990d732710c (diff) | |
parent | f97f6e5985b5781ce87a2095b4bf9cccb12ae978 (diff) | |
download | slixmpp-3657bf66363844bf7351ea84279eeb74b0449d5f.tar.gz slixmpp-3657bf66363844bf7351ea84279eeb74b0449d5f.tar.bz2 slixmpp-3657bf66363844bf7351ea84279eeb74b0449d5f.tar.xz slixmpp-3657bf66363844bf7351ea84279eeb74b0449d5f.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests')
0 files changed, 0 insertions, 0 deletions