diff options
| author | Marius Halden <marius.h@lden.org> | 2016-07-09 18:06:09 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-07-09 18:06:09 +0200 |
| commit | ef9769c1e59dec5435670b507712c5fa9dfede67 (patch) | |
| tree | 5654f07fad56346642b3ddf292aa1558ff574b17 /protocols/jabber/sasl.c | |
| parent | 2f2fb6dda408ad2562cc754e2ca0ad3c2ea8bc8e (diff) | |
| parent | f60dc5cb68ac91df714f01ef61ba819eeac584aa (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols/jabber/sasl.c')
0 files changed, 0 insertions, 0 deletions