diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-08 16:21:05 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-08 16:21:05 +0100 |
commit | fb972a1ea95f574ecacd7a213a04c4cab5e41f56 (patch) | |
tree | b72ea8b35e4dae603543a1b490f959f32b930870 /util/xmppstream.lua | |
parent | 8502b7dc5d7169a43be5dd6fca14417ed39187a4 (diff) | |
parent | 9b4c1c40131ef343f5141242e134b18c45c2f128 (diff) | |
download | prosody-fb972a1ea95f574ecacd7a213a04c4cab5e41f56.tar.gz prosody-fb972a1ea95f574ecacd7a213a04c4cab5e41f56.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/xmppstream.lua')
0 files changed, 0 insertions, 0 deletions