diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:18:44 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:18:44 -0500 |
| commit | a278f79bdbdb842193092a9e0176ecb8b1867762 (patch) | |
| tree | c55be3e45f61133c01969be201d3a6476dbe5762 /sleekxmpp/stanza/atom.py | |
| parent | 606c369173e7a31d793540d90e425a78c2a81253 (diff) | |
| parent | d709f8db657aa1d1314082d842dd29e2546739c4 (diff) | |
| download | slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.gz slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.bz2 slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.xz slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.zip | |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/stanza/atom.py')
0 files changed, 0 insertions, 0 deletions