diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-06-10 15:14:51 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-06-10 15:14:51 -0700 |
| commit | 7a60e4b458ed58f2a130f5da24ad36bf62426329 (patch) | |
| tree | 400706b2e9243e04ecc859f55d8f9708c0930ae1 /sleekxmpp/thirdparty | |
| parent | 823c13707db1251b06a9bb06a2d41eb5d0851e94 (diff) | |
| parent | e2d18170b00349e07b4e74fa16c73368c19863d4 (diff) | |
| download | slixmpp-7a60e4b458ed58f2a130f5da24ad36bf62426329.tar.gz slixmpp-7a60e4b458ed58f2a130f5da24ad36bf62426329.tar.bz2 slixmpp-7a60e4b458ed58f2a130f5da24ad36bf62426329.tar.xz slixmpp-7a60e4b458ed58f2a130f5da24ad36bf62426329.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/thirdparty')
0 files changed, 0 insertions, 0 deletions