diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-04-15 22:46:57 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-04-15 22:46:57 +0100 |
commit | f92368a2cf2302c2189a3999940a4f8481747c7e (patch) | |
tree | 3e38f864eecc748e87f2fbead4a6461f39337961 /util/xmppstream.lua | |
parent | ce5ae56ec4f89598787e7857e0e65464f4dbfe46 (diff) | |
parent | 0f81719d6086ee57e06002eadfd98d8b869e41ae (diff) | |
download | prosody-f92368a2cf2302c2189a3999940a4f8481747c7e.tar.gz prosody-f92368a2cf2302c2189a3999940a4f8481747c7e.zip |
Merge 0.8->trunk
Diffstat (limited to 'util/xmppstream.lua')
0 files changed, 0 insertions, 0 deletions