Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 6525:7c273da3cff6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Nov 2014 15:01:47 +0100 |
| parents | d016437e01bf |
| children | 6728ad041761 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Nov 2014 15:01:47 +0100 |
| parents | d016437e01bf |
| children | 6728ad041761 |