diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-20 23:39:45 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-20 23:39:45 +0200 |
commit | 78485768ee3faccea47511db836410f7fa34c03e (patch) | |
tree | 98ca74d989832843edfb586f3e4c72d65ebd6819 /prosodyctl | |
parent | c70505a8c46db03728c800f45ff627d555a500a4 (diff) | |
parent | 84ab9b78050508f04edaecdf502d111247ab1c75 (diff) | |
download | prosody-78485768ee3faccea47511db836410f7fa34c03e.tar.gz prosody-78485768ee3faccea47511db836410f7fa34c03e.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions