diff options
author | James Booth <boothj5@gmail.com> | 2013-08-13 21:40:18 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2013-08-13 21:40:18 +0100 |
commit | 6ea17d8e01af4a1867f32d1a9d9166bf10ce8ba3 (patch) | |
tree | 66d9a18a85ec7c448a71c52cc06d48bd3c2e5291 /src/xmpp/connection.c | |
parent | 6651b13bd0a68da3688cf2f29b467194ab3695f9 (diff) | |
parent | b1768f942c086410abfb7ca03e3a20fe472fafe6 (diff) | |
download | profani-tty-6ea17d8e01af4a1867f32d1a9d9166bf10ce8ba3.tar.gz |
Merge branch 'master' into nextdev
Diffstat (limited to 'src/xmpp/connection.c')
0 files changed, 0 insertions, 0 deletions