diff options
author | Kim Alvefur <zash@zash.se> | 2015-12-12 02:33:15 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-12-12 02:33:15 +0100 |
commit | 9f3f9241db8a09a45a418ca6569adf6935898dbd (patch) | |
tree | eb25e806fa92c8e2587a429560f50b893ae369f1 /util/xmppstream.lua | |
parent | 08583d3855eb35d5758e3df47272f7296728a0b3 (diff) | |
parent | 30b54f4ad71fb58310f2b0b3bf7d0392b61a4ff6 (diff) | |
download | prosody-9f3f9241db8a09a45a418ca6569adf6935898dbd.tar.gz prosody-9f3f9241db8a09a45a418ca6569adf6935898dbd.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/xmppstream.lua')
0 files changed, 0 insertions, 0 deletions