| commit | 6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae | |
| author | Lance Stout <lancestout@gmail.com> | |
| Fri, 5 Aug 2011 21:08:32 +0000 (5 14:08 -0700) | ||
| committer | Lance Stout <lancestout@gmail.com> | |
| Fri, 5 Aug 2011 21:08:32 +0000 (5 14:08 -0700) | ||
| tree | ea302d475b38c694bb147fb3e730ee488b3bf717 | treesnapshot (tar.gz zip) |
| parent | ea95811c4c76ae96bc41c4fab48886dd2e85c7a9 | commitdiff |
| parent | 148a23579c199d218325c88d7b6f567f42c7a36a | commitdiff |
Merge branch 'master' into develop
Adds hotfix for ANONYMOUS mech support.
Conflicts:
sleekxmpp/__init__.py
Adds hotfix for ANONYMOUS mech support.
Conflicts:
sleekxmpp/__init__.py