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