Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 6473:7c8f58d2b331
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 Oct 2014 10:59:27 +0100 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 Oct 2014 10:59:27 +0100 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |