Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 5249:d1baef49be21
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 16 Dec 2012 08:37:14 +0100 |
| parents | c0c060e450be |
| children | 0439d1349dc1 57060d0cee4b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 16 Dec 2012 08:37:14 +0100 |
| parents | c0c060e450be |
| children | 0439d1349dc1 57060d0cee4b |