Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 6603:e702ae7aa3d9
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 26 Mar 2015 16:49:03 +0000 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 26 Mar 2015 16:49:03 +0000 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |