diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-12-16 23:32:29 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-12-16 23:32:29 +0000 |
commit | 23495e0d6370ad80f1cb2be65f348976fe8ce616 (patch) | |
tree | ab0fddd4e080c463c9921b89873ff055071dd4e8 /util/prosodyctl.lua | |
parent | f68040e8b167145249be9a248d7b7af37026255b (diff) | |
parent | 535e8c110294835d941ac834e88eeb8bb84d14f1 (diff) | |
download | prosody-23495e0d6370ad80f1cb2be65f348976fe8ce616.tar.gz prosody-23495e0d6370ad80f1cb2be65f348976fe8ce616.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions