Mercurial > prosody-hg
diff util/prosodyctl.lua @ 4222:2805ebd57d7d
Merge 0.8->trunk.
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Wed, 02 Mar 2011 05:15:54 +0500 |
| parents | caa78589598f |
| children | 3a2a01432b5c |
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Wed, 02 Mar 2011 05:15:54 +0500 |
| parents | caa78589598f |
| children | 3a2a01432b5c |