Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 6001:34f43c8167e5
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 21 Jan 2014 03:26:04 +0000 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 21 Jan 2014 03:26:04 +0000 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |