Mercurial > prosody-hg
diff plugins/mod_pubsub.lua @ 5193:a08b9448f277
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 22 Nov 2012 21:01:00 +0000 |
| parents | b2006c1cfa85 |
| children | 67a49d47ef39 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 22 Nov 2012 21:01:00 +0000 |
| parents | b2006c1cfa85 |
| children | 67a49d47ef39 |