Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 4956:bc26e6d519ae
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | a2ee8ab82dd9 |
| children | 0f72123ff513 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | a2ee8ab82dd9 |
| children | 0f72123ff513 |