diff options
author | Lance Stout <lancestout@gmail.com> | 2011-06-15 10:56:49 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-06-15 10:56:49 -0700 |
commit | 393d702e77a82231a20b42a75e191b7e00b3f5c3 (patch) | |
tree | 49f0a29cc3a385e7cd1f1f1a04d0c175dbbcac2d /sleekxmpp/thirdparty | |
parent | 8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2 (diff) | |
parent | 58aa944a5e07032fc8d5770347f82e7c2ce6c948 (diff) | |
download | slixmpp-393d702e77a82231a20b42a75e191b7e00b3f5c3.tar.gz slixmpp-393d702e77a82231a20b42a75e191b7e00b3f5c3.tar.bz2 slixmpp-393d702e77a82231a20b42a75e191b7e00b3f5c3.tar.xz slixmpp-393d702e77a82231a20b42a75e191b7e00b3f5c3.zip |
Merge branch 'develop' into exceptions
Diffstat (limited to 'sleekxmpp/thirdparty')
0 files changed, 0 insertions, 0 deletions