Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 5928:1f6923702fc3
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 28 Nov 2013 16:17:21 +0100 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 28 Nov 2013 16:17:21 +0100 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |