diff options
author | Lance Stout <lancestout@gmail.com> | 2011-05-20 21:40:37 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 21:40:37 -0400 |
commit | bb2bc64d15fd33b66193326554b67e9f71d6f90f (patch) | |
tree | ff1730986f52a3c4760a82982d751af6329d9dba /sleekxmpp/xmlstream | |
parent | baa1eaf73a1892c5a653965ff65e6532115a9a76 (diff) | |
parent | 7152d93dd05346fdb7dbe1893bff6395f83a79a9 (diff) | |
download | slixmpp-bb2bc64d15fd33b66193326554b67e9f71d6f90f.tar.gz slixmpp-bb2bc64d15fd33b66193326554b67e9f71d6f90f.tar.bz2 slixmpp-bb2bc64d15fd33b66193326554b67e9f71d6f90f.tar.xz slixmpp-bb2bc64d15fd33b66193326554b67e9f71d6f90f.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/xmlstream')
0 files changed, 0 insertions, 0 deletions