diff options
author | Lance Stout <lancestout@gmail.com> | 2012-10-05 08:58:22 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-10-05 08:58:22 -0700 |
commit | fc07e23ff8f2eb7c67a1dfeae0db67b182144fca (patch) | |
tree | 3e4e276c988470cb178bf71722c9899fe08e2534 /sleekxmpp/features/feature_mechanisms/__init__.py | |
parent | 84a2fc382b88133ce2398b1fac8c92196ddeb8dd (diff) | |
parent | 4ea328b9f2d56383c53e9707c97aa689010c837d (diff) | |
download | slixmpp-fc07e23ff8f2eb7c67a1dfeae0db67b182144fca.tar.gz slixmpp-fc07e23ff8f2eb7c67a1dfeae0db67b182144fca.tar.bz2 slixmpp-fc07e23ff8f2eb7c67a1dfeae0db67b182144fca.tar.xz slixmpp-fc07e23ff8f2eb7c67a1dfeae0db67b182144fca.zip |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms/__init__.py')
0 files changed, 0 insertions, 0 deletions