Mercurial > prosody-hg
diff plugins/adhoc/mod_adhoc.lua @ 5160:da7fe5de82fb
Merge 0.9 -> trunk (like this?)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | 58714123f600 |
| children | e599d9a367cf |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | 58714123f600 |
| children | e599d9a367cf |