diff options
author | Lance Stout <lancestout@gmail.com> | 2011-04-08 16:52:20 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-04-08 16:52:20 -0400 |
commit | b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c (patch) | |
tree | 8c02fb1471a5a9f8cac686f9df1d54ca886dd821 /sleekxmpp/basexmpp.py | |
parent | 6b0593857352c851ce2e55743802ab5fbdd81f5f (diff) | |
parent | f02b0564e0cf664364cd6694a5df6d588071ec62 (diff) | |
download | slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.tar.gz slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.tar.bz2 slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.tar.xz slixmpp-b60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/basexmpp.py')
0 files changed, 0 insertions, 0 deletions