Software / code / prosody
Diff
prosodyctl @ 3376:529bc6ea24e2
Merge Zash->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 16 Jul 2010 15:10:45 +0100 |
| parent | 3339:7893055e54d1 |
| child | 3471:482275e38224 |
/ code / prosody | author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 16 Jul 2010 15:10:45 +0100 |
| parent | 3339:7893055e54d1 |
| child | 3471:482275e38224 |