Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 5651:c968c8e3596d
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 07 Jun 2013 13:23:04 +0100 |
| parents | db5d1a350cc7 |
| children | 9f9de8078164 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 07 Jun 2013 13:23:04 +0100 |
| parents | db5d1a350cc7 |
| children | 9f9de8078164 |