diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-03-26 16:49:03 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-03-26 16:49:03 +0000 |
commit | f52319aeb3d82d34fdf8699084cdff3460d43c5c (patch) | |
tree | 5c9f629f0035697faa311531db3b3d0267e4f1e3 /util/prosodyctl.lua | |
parent | 829b01aba17e13d75c13679fe6343171378e25d9 (diff) | |
parent | 5cc3f03d5aab0516358addd949281c2e3fa70688 (diff) | |
download | prosody-f52319aeb3d82d34fdf8699084cdff3460d43c5c.tar.gz prosody-f52319aeb3d82d34fdf8699084cdff3460d43c5c.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions