Mercurial > prosody-hg
diff plugins/adhoc/adhoc.lib.lua @ 6428:3ee09bfe16e1
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 23 Sep 2014 23:22:13 +0200 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 23 Sep 2014 23:22:13 +0200 |
| parents | 76699a0ae4c4 |
| children | 2b91da49285a |