Software / code / prosody
Diff
prosodyctl @ 7120:a6afe52159f1
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 03 Feb 2016 02:13:03 +0100 |
| parent | 7082:8b590fc77d91 |
| child | 7147:81e54032d14d |
| child | 7190:7a14ea196db3 |
