Mercurial > prosody-hg
diff plugins/mod_pubsub.lua @ 5239:cf4954f1c35a
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 11 Dec 2012 23:41:02 +0100 |
| parents | b2006c1cfa85 |
| children | 67a49d47ef39 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 11 Dec 2012 23:41:02 +0100 |
| parents | b2006c1cfa85 |
| children | 67a49d47ef39 |