Mercurial > prosody-hg
diff plugins/mod_pubsub/pubsub.lib.lua @ 6145:69bc9dfcbd89
Merge daurnimator->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Apr 2014 17:42:44 +0100 |
| parents | cdcfd93e2f43 |
| children | b1c40054b59d |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Apr 2014 17:42:44 +0100 |
| parents | cdcfd93e2f43 |
| children | b1c40054b59d |