diff options
author | Lance Stout <lancestout@gmail.com> | 2011-06-10 15:14:37 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-06-10 15:14:37 -0700 |
commit | 937dce8e65a1e6c04c6c6eb4a194c6d4b6e89f92 (patch) | |
tree | 1f65ff9afc7fd24310905b6319f5c6a66aaf02fa /sleekxmpp/componentxmpp.py | |
parent | 8eb59072b4d5b88a0741e7ef7bb61fa357bffeae (diff) | |
parent | e2d18170b00349e07b4e74fa16c73368c19863d4 (diff) | |
download | slixmpp-937dce8e65a1e6c04c6c6eb4a194c6d4b6e89f92.tar.gz slixmpp-937dce8e65a1e6c04c6c6eb4a194c6d4b6e89f92.tar.bz2 slixmpp-937dce8e65a1e6c04c6c6eb4a194c6d4b6e89f92.tar.xz slixmpp-937dce8e65a1e6c04c6c6eb4a194c6d4b6e89f92.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/componentxmpp.py')
0 files changed, 0 insertions, 0 deletions