Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 3301:772fb30b28fb
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 29 Jun 2010 20:17:21 +0100 |
| parents | a5c3a82d677e |
| children | c9294e190bb6 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 29 Jun 2010 20:17:21 +0100 |
| parents | a5c3a82d677e |
| children | c9294e190bb6 |