Mercurial > prosody-hg
diff plugins/mod_pubsub/mod_pubsub.lua @ 6168:3942630b4e35
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 May 2014 23:35:54 +0200 |
| parents | 905b4fd863b4 |
| children | 0f4025abbe8f |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 May 2014 23:35:54 +0200 |
| parents | 905b4fd863b4 |
| children | 0f4025abbe8f |