diff options
author | Kim Alvefur <zash@zash.se> | 2014-06-21 15:05:21 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-06-21 15:05:21 +0200 |
commit | 0226460cacd55adf96cb46f57f6a010181f445c5 (patch) | |
tree | 4b91a8b3eb46356ffbeb1e5b957c23ca30c77722 /prosodyctl | |
parent | 13f1842f157c7c15e227db8888e927f524764450 (diff) | |
parent | cec57902419e17aaa183bc0a248709c6037f5373 (diff) | |
download | prosody-0226460cacd55adf96cb46f57f6a010181f445c5.tar.gz prosody-0226460cacd55adf96cb46f57f6a010181f445c5.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions