diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:24:57 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:24:57 +0000 |
commit | 315e3b3b937c22224c4530a194420f1b2fd77316 (patch) | |
tree | f7d0930c79494da535857eaf4f2a976bb052fa35 /util/xmppstream.lua | |
parent | 2f531bc782386106af9c8f297594a13c81ae660c (diff) | |
parent | 847f4204accf62ae15f623698c4842b08440a2cd (diff) | |
download | prosody-315e3b3b937c22224c4530a194420f1b2fd77316.tar.gz prosody-315e3b3b937c22224c4530a194420f1b2fd77316.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/xmppstream.lua')
0 files changed, 0 insertions, 0 deletions