Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 4541:05f5ec99da77
Merge with trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 Jan 2012 22:55:49 +0000 |
| parents | a2ee8ab82dd9 |
| children | 0f72123ff513 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 Jan 2012 22:55:49 +0000 |
| parents | a2ee8ab82dd9 |
| children | 0f72123ff513 |