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