diff options
| author | James Booth <boothj5@gmail.com> | 2013-09-23 01:38:48 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-09-23 01:38:48 +0100 |
| commit | aac605ccbb13c1f47f0588b2985caa2a98f76544 (patch) | |
| tree | 33a835b32b8771582356f5245310897aff4496ef /src/xmpp/roster.c | |
| parent | df63d37a3e768634e42ded9b40685edb24d85814 (diff) | |
| parent | ce3b99f5771809f38119e9449099bdb1b0768b8f (diff) | |
| download | profani-tty-aac605ccbb13c1f47f0588b2985caa2a98f76544.tar.gz | |
Merge branch 'master' into otr
Diffstat (limited to 'src/xmpp/roster.c')
0 files changed, 0 insertions, 0 deletions