Mercurial > prosody-hg
diff util/prosodyctl.lua @ 1229:331a68645f67
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 29 May 2009 22:06:21 +0100 |
| parents | 442c87de8e2d |
| children | 9991329e6b67 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 29 May 2009 22:06:21 +0100 |
| parents | 442c87de8e2d |
| children | 9991329e6b67 |