Mercurial > prosody-hg
diff plugins/mod_pubsub/mod_pubsub.lua @ 6473:7c8f58d2b331
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 Oct 2014 10:59:27 +0100 |
| parents | 011ca9b88179 |
| children | 25d86b0f2147 c9a72c64c3e2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 Oct 2014 10:59:27 +0100 |
| parents | 011ca9b88179 |
| children | 25d86b0f2147 c9a72c64c3e2 |