Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 6621:352fa2cae1c9
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 03 Apr 2015 19:34:47 +0100 |
| parents | 7c8f58d2b331 |
| children | be87ab2d611c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 03 Apr 2015 19:34:47 +0100 |
| parents | 7c8f58d2b331 |
| children | be87ab2d611c |