Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 6679:96e034508978
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 13 May 2015 17:00:27 +0100 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 13 May 2015 17:00:27 +0100 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |