Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 4684:dc70c4ffb66d
Merge timber->trunk - thanks everyone!
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Apr 2012 21:59:20 +0100 |
| parents | 875b90d5ce0f |
| children | d8b9fe5900a2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Apr 2012 21:59:20 +0100 |
| parents | 875b90d5ce0f |
| children | d8b9fe5900a2 |