diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-08-07 16:45:20 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-08-07 16:45:20 -0700 |
| commit | 14aa8311690f3a58ff4b7ad286bcccdd867789f7 (patch) | |
| tree | 311b4e7e83fb51386b417d070a16c8757aa958de /sleekxmpp/xmlstream/resolver.py | |
| parent | 75d904ed01921eaa95ba3cd22c4740d77729913d (diff) | |
| parent | 295d23ccf37860245d0e86b38a3a2315532f2972 (diff) | |
| download | slixmpp-14aa8311690f3a58ff4b7ad286bcccdd867789f7.tar.gz slixmpp-14aa8311690f3a58ff4b7ad286bcccdd867789f7.tar.bz2 slixmpp-14aa8311690f3a58ff4b7ad286bcccdd867789f7.tar.xz slixmpp-14aa8311690f3a58ff4b7ad286bcccdd867789f7.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/resolver.py')
0 files changed, 0 insertions, 0 deletions