diff options
author | Kim Alvefur <zash@zash.se> | 2014-05-12 01:18:27 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-05-12 01:18:27 +0200 |
commit | bfaae84321dda02b19b483068379d044ecb0c7a6 (patch) | |
tree | 85a6edd63d238521a229d13a1d2cde1bb91faf9d /util/xmppstream.lua | |
parent | ccb5e87519070a995cfad8090f517d4273cbeec9 (diff) | |
parent | a88f746203415474f1fb6cd2c9d4f5b6875f6b17 (diff) | |
download | prosody-bfaae84321dda02b19b483068379d044ecb0c7a6.tar.gz prosody-bfaae84321dda02b19b483068379d044ecb0c7a6.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/xmppstream.lua')
0 files changed, 0 insertions, 0 deletions