Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 5759:767e29b2cd3a
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Jul 2013 21:50:38 +0200 |
| parents | 832ea1e9ac9e |
| children | 9cef4b5c2fe3 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Jul 2013 21:50:38 +0200 |
| parents | 832ea1e9ac9e |
| children | 9cef4b5c2fe3 |