| commit | 484efff156e344fc3ca1a7377539132b702c0c78 | |
| author | Lance Stout <lancestout@gmail.com> | |
| Fri, 12 Aug 2011 23:47:58 +0000 (12 16:47 -0700) | ||
| committer | Lance Stout <lancestout@gmail.com> | |
| Fri, 12 Aug 2011 23:47:58 +0000 (12 16:47 -0700) | ||
| tree | fa051515b9dc15eb3a5ab1a8e8b9c2e25b920d17 | treesnapshot (tar.gz zip) |
| parent | 89cffd43f48cfc835b70e137776eb8c2e73a0b67 | commitdiff |
| parent | 8f1d0e7a79b662e5f2849cea6e73716cc887e226 | commitdiff |
Merge branch 'develop' into roster
Conflicts:
setup.py
sleekxmpp/clientxmpp.py
Conflicts:
setup.py
sleekxmpp/clientxmpp.py