Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 6054:7a5ddbaf758d
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 02 Apr 2014 17:41:38 +0100 |
| parents | ebc074918173 |
| children | 76699a0ae4c4 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 02 Apr 2014 17:41:38 +0100 |
| parents | ebc074918173 |
| children | 76699a0ae4c4 |