diff options
author | Kim Alvefur <zash@zash.se> | 2014-03-25 19:16:38 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-03-25 19:16:38 +0100 |
commit | f7d4b04bf17c8b634eae00e814a995a88c5ba6cb (patch) | |
tree | 1dd9879238a7c2f688f02d2b61ed2877da2e9989 /util/prosodyctl.lua | |
parent | 03559cb06e7abb0245c2a73c75ad9a49297b48f6 (diff) | |
parent | aff3965927ff8763b477b97a4be4f477186738a0 (diff) | |
download | prosody-f7d4b04bf17c8b634eae00e814a995a88c5ba6cb.tar.gz prosody-f7d4b04bf17c8b634eae00e814a995a88c5ba6cb.zip |
Merge 0.9->0.10
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions