diff options
author | James Booth <boothj5@gmail.com> | 2012-11-06 01:00:20 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2012-11-06 01:00:20 +0000 |
commit | 7e9299c24077990414f80de6aa8f5103f8da2944 (patch) | |
tree | e24abb6e048144fa68734bedd65c822a9134722f /src/jabber.c | |
parent | 578aca6be359dcbede6f657080629898307c9491 (diff) | |
parent | 75fb8ea2edabe45b554d0865c567318b1dc065ce (diff) | |
download | profani-tty-7e9299c24077990414f80de6aa8f5103f8da2944.tar.gz |
Merge branch 'master' into muc
Diffstat (limited to 'src/jabber.c')
0 files changed, 0 insertions, 0 deletions