diff options
| author | James Booth <boothj5@gmail.com> | 2013-08-05 23:18:19 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-08-05 23:18:19 +0100 |
| commit | 6651b13bd0a68da3688cf2f29b467194ab3695f9 (patch) | |
| tree | 5a10d9428ca17307d3a8e09ad273579edf8aec5b /src/xmpp/connection.c | |
| parent | 3588a9d7761669f6d1c6776a07cc0555afd4b084 (diff) | |
| parent | 42eef398b4eb4d311dd97037af715d4d4119adf4 (diff) | |
| download | profani-tty-6651b13bd0a68da3688cf2f29b467194ab3695f9.tar.gz | |
Merge branch 'master' into nextdev
Diffstat (limited to 'src/xmpp/connection.c')
0 files changed, 0 insertions, 0 deletions