Software / code / prosody
Diff
prosodyctl @ 7295:5f9c8204270f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 18 Mar 2016 00:08:58 +0100 |
| parent | 7269:cde4ef90cf3d |
| child | 7302:92d86016e1e3 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 18 Mar 2016 00:08:58 +0100 |
| parent | 7269:cde4ef90cf3d |
| child | 7302:92d86016e1e3 |