Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 5651:c968c8e3596d
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 07 Jun 2013 13:23:04 +0100 |
| parents | 8416d4619d80 |
| children | cdcfd93e2f43 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 07 Jun 2013 13:23:04 +0100 |
| parents | 8416d4619d80 |
| children | cdcfd93e2f43 |