Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 4316:2478698bdc52
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 07 Jun 2011 01:29:34 +0100 |
| parents | 122f142da281 |
| children | 15547fba1f09 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 07 Jun 2011 01:29:34 +0100 |
| parents | 122f142da281 |
| children | 15547fba1f09 |