Mercurial > prosody-hg
comparison plugins/mod_disco.lua @ 5162:cda4d3f01ddd
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 29 Sep 2012 10:47:37 +0100 |
| parents | c0c060e450be |
| children | 0439d1349dc1 57060d0cee4b |
comparison
equal
deleted
inserted
replaced
| 5161:3275a9705ef3 | 5162:cda4d3f01ddd |
|---|
