Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 6081:19ada596aec4
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 20:36:39 +0200 |
| parents | 0f6399c86c10 |
| children | 3a1c39b31497 79318d548465 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 20:36:39 +0200 |
| parents | 0f6399c86c10 |
| children | 3a1c39b31497 79318d548465 |