diff options
author | James Booth <boothj5@gmail.com> | 2013-08-04 17:05:47 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2013-08-04 17:05:47 +0100 |
commit | 87c627710906171b3696e65fac985bd50c43c6f3 (patch) | |
tree | 0e4abf6afbaf2f3b754d288f5e50adaadc39b4a1 /src/xmpp/iq.h | |
parent | 51b2137705b99ad45a8d4d646da9f3f8e2b3b4db (diff) | |
parent | e170965c93ae838f3eff00f7558de5186268dd8b (diff) | |
download | profani-tty-87c627710906171b3696e65fac985bd50c43c6f3.tar.gz |
Merge branch 'master' into nextdev
Diffstat (limited to 'src/xmpp/iq.h')
0 files changed, 0 insertions, 0 deletions