diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-01-16 16:26:35 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-01-16 16:26:35 -0800 |
| commit | 1dbfa29a1ebb9becb93911b33f026cc1a7a7faee (patch) | |
| tree | 0fc8c30012eb151f2f6fe2637b71ec47bb074bbf /sleekxmpp/features/feature_mechanisms/mechanisms.py | |
| parent | a0266dac6f30a1bfa89360a16ec70904b552f0a1 (diff) | |
| parent | 6bac4741f6ca7d73c43ae0fcb138b07e71ed1352 (diff) | |
| download | slixmpp-1dbfa29a1ebb9becb93911b33f026cc1a7a7faee.tar.gz slixmpp-1dbfa29a1ebb9becb93911b33f026cc1a7a7faee.tar.bz2 slixmpp-1dbfa29a1ebb9becb93911b33f026cc1a7a7faee.tar.xz slixmpp-1dbfa29a1ebb9becb93911b33f026cc1a7a7faee.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms/mechanisms.py')
0 files changed, 0 insertions, 0 deletions