Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 6469:93ffe59a9546
Merge 0.10->trunk
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Wed, 08 Oct 2014 18:47:01 -0400 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Wed, 08 Oct 2014 18:47:01 -0400 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |