Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 5751:3dd3bb40df56
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 15 Jul 2013 23:35:49 +0100 |
| parents | 58714123f600 |
| children | e599d9a367cf |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 15 Jul 2013 23:35:49 +0100 |
| parents | 58714123f600 |
| children | e599d9a367cf |