Mercurial > prosody-hg
diff plugins/mod_pubsub/mod_pubsub.lua @ 5936:97b891475cd6
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 11 Dec 2013 22:32:17 +0000 |
| parents | cdcfd93e2f43 |
| children | 905b4fd863b4 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 11 Dec 2013 22:32:17 +0000 |
| parents | cdcfd93e2f43 |
| children | 905b4fd863b4 |