Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 6083:31b2f82e2d3c
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 21:54:44 +0200 |
| parents | cdcfd93e2f43 |
| children | b1c40054b59d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 21:54:44 +0200 |
| parents | cdcfd93e2f43 |
| children | b1c40054b59d |