Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 1806:c55e06eb53b2
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Sep 2009 14:42:29 +0100 |
| parents | 9b445d2427e2 |
| children | 29a30884aadd b7049746bd29 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Sep 2009 14:42:29 +0100 |
| parents | 9b445d2427e2 |
| children | 29a30884aadd b7049746bd29 |