Software / code / prosody
Diff
prosodyctl @ 6799:4fc6b0a090bb
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Aug 2015 13:17:37 +0200 |
| parent | 6784:4da860edc27c |
| child | 6837:13b44929ae49 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Aug 2015 13:17:37 +0200 |
| parent | 6784:4da860edc27c |
| child | 6837:13b44929ae49 |