Software / code / prosody
Diff
prosodyctl @ 5861:c3ee62b3bdfe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 07 Oct 2013 12:56:53 +0200 |
| parent | 5809:be997c6a69be |
| child | 6038:b3ceb7627e27 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 07 Oct 2013 12:56:53 +0200 |
| parent | 5809:be997c6a69be |
| child | 6038:b3ceb7627e27 |