Mercurial > prosody-hg
comparison plugins/mod_pubsub/pubsub.lib.lua @ 6428:3ee09bfe16e1
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 23 Sep 2014 23:22:13 +0200 |
| parents | cdcfd93e2f43 |
| children | b1c40054b59d |
comparison
equal
deleted
inserted
replaced
| 6423:1c78f10f05d0 | 6428:3ee09bfe16e1 |
|---|
