Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 4321:4dcdba6900f2
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 12 Jun 2011 22:21:10 +0100 |
| parents | 122f142da281 |
| children | 15547fba1f09 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 12 Jun 2011 22:21:10 +0100 |
| parents | 122f142da281 |
| children | 15547fba1f09 |