Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 5480:415e520e4a4c
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 17 Apr 2013 14:20:02 +0100 |
| parents | ba9be0be4bbb |
| children | eeea0eb2602a |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 17 Apr 2013 14:20:02 +0100 |
| parents | ba9be0be4bbb |
| children | eeea0eb2602a |