Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 6315:7a3e2f2d43fc
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |