Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 6679:96e034508978
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 13 May 2015 17:00:27 +0100 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 13 May 2015 17:00:27 +0100 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |