Software / code / prosody
Diff
prosodyctl @ 1339:7d77f92f94c9
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Jun 2009 11:37:34 +0100 |
| parent | 1205:23a079f50cab |
| child | 1390:ef672c9fe7c9 |
