diff options
| author | Brian Beggs <macdiesel@gmail.com> | 2010-07-01 09:17:45 -0400 |
|---|---|---|
| committer | Brian Beggs <macdiesel@gmail.com> | 2010-07-01 09:17:45 -0400 |
| commit | d763795b2cb01fd90b8d7661bfafdb80d84e13c8 (patch) | |
| tree | a3338228fae061aebed3b6e69d231e22ec5351f2 /MANIFEST | |
| parent | fff54eaf2f069db22c2a0a3cf0e522d628e188b3 (diff) | |
| parent | 1e3a6e1b5f06d307295be6b4ccaf75bf2a48399d (diff) | |
| download | slixmpp-d763795b2cb01fd90b8d7661bfafdb80d84e13c8.tar.gz slixmpp-d763795b2cb01fd90b8d7661bfafdb80d84e13c8.tar.bz2 slixmpp-d763795b2cb01fd90b8d7661bfafdb80d84e13c8.tar.xz slixmpp-d763795b2cb01fd90b8d7661bfafdb80d84e13c8.zip | |
Merge remote branch 'fritzy/master'
Conflicts:
sleekxmpp/__init__.py
sleekxmpp/basexmpp.py
sleekxmpp/stanza/error.py
Diffstat (limited to 'MANIFEST')
0 files changed, 0 insertions, 0 deletions