diff options
author | Kim Alvefur <zash@zash.se> | 2013-10-07 12:56:53 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-10-07 12:56:53 +0200 |
commit | 7da00de6e9c6990da97da982a4691213562d6e22 (patch) | |
tree | 121f351fb160d4534449768e1c2808a66e05e74e /prosodyctl | |
parent | dbb308a3935ce41afa777500b828ed21bb7e508a (diff) | |
parent | 913e2225b5dcf1baf7d623122046da4f27766a04 (diff) | |
download | prosody-7da00de6e9c6990da97da982a4691213562d6e22.tar.gz prosody-7da00de6e9c6990da97da982a4691213562d6e22.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions