Mercurial > prosody-modules
diff mod_json_streams/strophe.jsonstreams.js @ 416:10ff12fa82e2
merge.
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | 0b4fe47e648d |
| children | 7dbde05b48a9 |
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 02 Sep 2011 23:36:22 +0000 |
| parents | 0b4fe47e648d |
| children | 7dbde05b48a9 |