Software / code / prosody
Diff
prosodyctl @ 5897:296e32a1ff33
Merge 0.10 -> trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parent | 5809:be997c6a69be |
| child | 6038:b3ceb7627e27 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parent | 5809:be997c6a69be |
| child | 6038:b3ceb7627e27 |