Software / code / prosody
Diff
prosodyctl @ 7146:c793f9d13a36
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 05 Feb 2016 16:31:34 +0100 |
| parent | 7082:8b590fc77d91 |
| child | 7147:81e54032d14d |
| child | 7190:7a14ea196db3 |
