Software / code / prosody
Diff
prosodyctl @ 2940:7486b9216879
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 24 Mar 2010 22:48:12 +0000 |
| parent | 2706:c2dde8bda3fe |
| child | 3013:518e3f6f9946 |
| child | 3233:8f78e8164032 |
