Mercurial > prosody-hg
diff plugins/mod_pubsub.lua @ 4286:1bceebe2b117
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 02:31:18 +0100 |
| parents | d0767040236f |
| children | 76420412520e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 02:31:18 +0100 |
| parents | d0767040236f |
| children | 76420412520e |