diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-11-10 23:10:46 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-11-10 23:10:46 +0000 |
commit | c71bff87a6601ab98221fed02f8c9b2a97a45d6f (patch) | |
tree | ee4bb5e7ca57631ceb44efe91d1e839806ccc3bb /util/xmppstream.lua | |
parent | fd5b526846c3d031640fcd18a2bb8e421c27ea4e (diff) | |
parent | a80e00e16f382874e7caffd60b37160fc2d81f5b (diff) | |
download | prosody-c71bff87a6601ab98221fed02f8c9b2a97a45d6f.tar.gz prosody-c71bff87a6601ab98221fed02f8c9b2a97a45d6f.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/xmppstream.lua')
0 files changed, 0 insertions, 0 deletions