Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 6347:e1a7ccd82fce
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 10 Aug 2014 10:31:18 +0200 |
| parents | cdcfd93e2f43 |
| children | b1c40054b59d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 10 Aug 2014 10:31:18 +0200 |
| parents | cdcfd93e2f43 |
| children | b1c40054b59d |