diff options
| author | dequis <dx@dxzone.com.ar> | 2015-05-28 15:14:35 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2015-05-28 15:14:35 -0300 |
| commit | f453a7faa95f9210adbdba20644f280cce68c42e (patch) | |
| tree | e0b5326865ee5f731464b1da1b1b44c1ebdce493 /protocols/jabber/jabber.c | |
| parent | bef322e939457bf0f4bf9441e9ec1d6efe29c4af (diff) | |
| parent | d30444594e95471bb8da46789d791af53e1769f3 (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'protocols/jabber/jabber.c')
0 files changed, 0 insertions, 0 deletions