diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-03-20 11:50:57 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-03-20 11:50:57 -0700 |
| commit | 1c83391948a04858c9a2d61deb5a838487e7f022 (patch) | |
| tree | 2b4a840dac39174a20582d5d354074a77f7941fb /sleekxmpp | |
| parent | 59d1b8e1312387732e94aa5d06f7668d2865a211 (diff) | |
| parent | 5a4df56836e0b974564e321c76f72d0a59cae6b0 (diff) | |
| download | slixmpp-1c83391948a04858c9a2d61deb5a838487e7f022.tar.gz slixmpp-1c83391948a04858c9a2d61deb5a838487e7f022.tar.bz2 slixmpp-1c83391948a04858c9a2d61deb5a838487e7f022.tar.xz slixmpp-1c83391948a04858c9a2d61deb5a838487e7f022.zip | |
Merge remote-tracking branch 'hansent/master' into develop
Diffstat (limited to 'sleekxmpp')
0 files changed, 0 insertions, 0 deletions