Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 5897:296e32a1ff33
Merge 0.10 -> trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parents | ebc074918173 |
| children | 76699a0ae4c4 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parents | ebc074918173 |
| children | 76699a0ae4c4 |