Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 5978:d21ea6001bba
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 12 Jan 2014 06:19:37 -0500 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 12 Jan 2014 06:19:37 -0500 |
| parents | 785da1854eb9 |
| children | be87ab2d611c |