Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 5495:d5b07342fccf
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2013 11:14:16 +0100 |
| parents | 58714123f600 |
| children | e599d9a367cf |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2013 11:14:16 +0100 |
| parents | 58714123f600 |
| children | e599d9a367cf |