Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 5536:abb6c6e3d6dc
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 29 Apr 2013 10:44:18 +0100 |
| parents | c0c060e450be |
| children | 0439d1349dc1 57060d0cee4b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 29 Apr 2013 10:44:18 +0100 |
| parents | c0c060e450be |
| children | 0439d1349dc1 57060d0cee4b |