Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 6027:8c69cea8a1bf
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 22:21:55 +0100 |
| parents | 09151d26560a |
| children | 7a5ddbaf758d 16d5049fe842 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 22:21:55 +0100 |
| parents | 09151d26560a |
| children | 7a5ddbaf758d 16d5049fe842 |