diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-25 01:47:26 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-25 01:47:26 -0700 |
| commit | 16ec0f151a18030a948038aa6eca1f9f1b488928 (patch) | |
| tree | fba9d3ec4bd4350a1399dc2375b0aef6b55f8fc8 /sleekxmpp/features/feature_mechanisms | |
| parent | c42f1ad4c79863261977a9c5ea3b33be0b51b946 (diff) | |
| parent | 26dc6e90eae1b9e2675194dbf0a0836561fe62a0 (diff) | |
| download | slixmpp-16ec0f151a18030a948038aa6eca1f9f1b488928.tar.gz slixmpp-16ec0f151a18030a948038aa6eca1f9f1b488928.tar.bz2 slixmpp-16ec0f151a18030a948038aa6eca1f9f1b488928.tar.xz slixmpp-16ec0f151a18030a948038aa6eca1f9f1b488928.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms')
0 files changed, 0 insertions, 0 deletions