diff options
author | Kim Alvefur <zash@zash.se> | 2014-02-12 19:26:22 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-02-12 19:26:22 +0100 |
commit | a0ece01720887a029783f813da186d624aa41ba8 (patch) | |
tree | 32c8de1b1bd02761e9b058e38b71d78871078c54 /prosodyctl | |
parent | 528a8215a55b8421daa33b421efcd05e2300cc4c (diff) | |
parent | d624e1a07c6124f652f04eeb8c9704e6d94393e5 (diff) | |
download | prosody-a0ece01720887a029783f813da186d624aa41ba8.tar.gz prosody-a0ece01720887a029783f813da186d624aa41ba8.zip |
Merge 0.9 -> 0.10
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions