Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 5394:3d1de30fefec
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Mar 2013 12:17:15 +0000 |
| parents | 4d939d2b1574 |
| children | ebc074918173 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Mar 2013 12:17:15 +0000 |
| parents | 4d939d2b1574 |
| children | ebc074918173 |