Mercurial > prosody-hg
diff plugins/mod_pubsub.lua @ 4206:c88f646a34d3
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 24 Feb 2011 18:20:05 +0000 |
| parents | d62a2861f1f9 |
| children | f8dc8b9e0bdd |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 24 Feb 2011 18:20:05 +0000 |
| parents | d62a2861f1f9 |
| children | f8dc8b9e0bdd |