Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.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 | 8416d4619d80 |
| children | cdcfd93e2f43 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 22:21:55 +0100 |
| parents | 8416d4619d80 |
| children | cdcfd93e2f43 |