Software / code / prosody
Diff
prosodyctl @ 5946:04f2138dfa87
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 16 Dec 2013 02:04:43 +0000 |
| parent | 5809:be997c6a69be |
| child | 6038:b3ceb7627e27 |
/ code / prosody | author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 16 Dec 2013 02:04:43 +0000 |
| parent | 5809:be997c6a69be |
| child | 6038:b3ceb7627e27 |