Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 5595:b9c836dc8f2a
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 18 May 2013 12:03:03 +0100 |
| parents | 4d939d2b1574 |
| children | ebc074918173 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 18 May 2013 12:03:03 +0100 |
| parents | 4d939d2b1574 |
| children | ebc074918173 |