Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 5346:b8fbb9d07efc
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:30:35 +0000 |
| parents | c0c060e450be |
| children | 0439d1349dc1 57060d0cee4b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:30:35 +0000 |
| parents | c0c060e450be |
| children | 0439d1349dc1 57060d0cee4b |