Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 5814:5cf1c08805fb
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 03 Sep 2013 00:20:28 +0100 |
| parents | ebc074918173 |
| children | 76699a0ae4c4 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 03 Sep 2013 00:20:28 +0100 |
| parents | ebc074918173 |
| children | 76699a0ae4c4 |