Software / code / prosody
Diff
prosodyctl @ 5082:1ffc788c5696
Merge 0.9->trunk (who has been pushing to trunk?)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 05 Aug 2012 17:21:19 +0100 |
| parent | 5024:d25e1b9332cc |
| child | 5101:a94c43cad081 |
