diff options
author | Kim Alvefur <zash@zash.se> | 2015-08-11 10:29:25 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-08-11 10:29:25 +0200 |
commit | 258f8fd4b40ab68d7d5731097fcb0b1c9ec21dcd (patch) | |
tree | 02d74684d9b149679340af6d76c462c2a1d4a0b3 /util/xmppstream.lua | |
parent | 26dba92ae79d4ef4b36aeb6e38f9e538e9db8c9a (diff) | |
parent | 2b0b78b8b0210906d14f52f70fffefac2a744dba (diff) | |
download | prosody-258f8fd4b40ab68d7d5731097fcb0b1c9ec21dcd.tar.gz prosody-258f8fd4b40ab68d7d5731097fcb0b1c9ec21dcd.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/xmppstream.lua')
0 files changed, 0 insertions, 0 deletions