diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-03-30 19:48:04 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-03-30 19:48:04 +0100 |
commit | af3bc714626c4e7b5299ef675bb244e963c1cfaa (patch) | |
tree | 05a514961ba273cda5c75bca8aa60fc278c6befc /util/xmppstream.lua | |
parent | 3d22f29cfab86c8a1ae34400df258a3e9b47d9ac (diff) | |
parent | 3dbf4c9e57cec2baa98f8864263a3cd11d608707 (diff) | |
download | prosody-af3bc714626c4e7b5299ef675bb244e963c1cfaa.tar.gz prosody-af3bc714626c4e7b5299ef675bb244e963c1cfaa.zip |
Merge 0.7->trunk
Diffstat (limited to 'util/xmppstream.lua')
0 files changed, 0 insertions, 0 deletions