diff options
author | Thom Nichols <tmnichols@gmail.com> | 2010-06-02 14:15:07 -0400 |
---|---|---|
committer | Thom Nichols <tmnichols@gmail.com> | 2010-06-02 14:15:07 -0400 |
commit | 3a2f989c5e982529bbad80bff4ef67eacb0e8eac (patch) | |
tree | a15253e0324f9a2162ec9fcdc51f2ffc2a7e90aa /sleekxmpp/basexmpp.py | |
parent | 7930ed22f2371ba3405f9644f427bec9554d2a15 (diff) | |
parent | 060b4c39385e548d1b28bc5ea5bdb29417e156ea (diff) | |
download | slixmpp-3a2f989c5e982529bbad80bff4ef67eacb0e8eac.tar.gz slixmpp-3a2f989c5e982529bbad80bff4ef67eacb0e8eac.tar.bz2 slixmpp-3a2f989c5e982529bbad80bff4ef67eacb0e8eac.tar.xz slixmpp-3a2f989c5e982529bbad80bff4ef67eacb0e8eac.zip |
Merge branch 'master' into hacks
Diffstat (limited to 'sleekxmpp/basexmpp.py')
0 files changed, 0 insertions, 0 deletions