diff options
author | Kim Alvefur <zash@zash.se> | 2015-07-05 18:00:05 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-07-05 18:00:05 +0200 |
commit | 5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad (patch) | |
tree | ffbe134470891e53fe689b44843c22b48c6b680b /prosodyctl | |
parent | 6e187489a98a403ae236a9595fbd0f80d3ff6490 (diff) | |
parent | c9035dd6cdab062206e57e3df9415cb8e6f0bc0a (diff) | |
download | prosody-5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad.tar.gz prosody-5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions