Mercurial > prosody-hg
diff plugins/mod_pubsub/mod_pubsub.lua @ 5993:ef11b8bab405
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 18 Jan 2014 18:46:12 +0000 |
| parents | 6a2c3293d4d7 |
| children | 905b4fd863b4 382e03a40dd2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 18 Jan 2014 18:46:12 +0000 |
| parents | 6a2c3293d4d7 |
| children | 905b4fd863b4 382e03a40dd2 |