Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 5935:a367bae38385
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 11 Dec 2013 22:31:48 +0000 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 11 Dec 2013 22:31:48 +0000 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |