Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 6354:bbb4a82db32e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Aug 2014 19:22:08 +0200 |
| parents | cdcfd93e2f43 |
| children | b1c40054b59d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Aug 2014 19:22:08 +0200 |
| parents | cdcfd93e2f43 |
| children | b1c40054b59d |