diff options
author | Kim Alvefur <zash@zash.se> | 2014-06-30 13:11:01 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-06-30 13:11:01 +0200 |
commit | 75c19f9f6c36cb2fb954973f11825513030c6e54 (patch) | |
tree | 797403783259bad9e629c25caf71f8f832d36f76 /util/prosodyctl.lua | |
parent | 265b49cc49438767327fc3468561a4fbcf484fe0 (diff) | |
parent | 7ef57da0477d5d0cad42f85c3a3027d35eae0968 (diff) | |
download | prosody-75c19f9f6c36cb2fb954973f11825513030c6e54.tar.gz prosody-75c19f9f6c36cb2fb954973f11825513030c6e54.zip |
Merge 0.9->0.10
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions