Mercurial > prosody-hg
diff util/xmppstream.lua @ 5194:9dca5bd5c2be
Merge with a merge (or something)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 22 Nov 2012 21:02:27 +0000 |
| parents | 0da4e0f0f0ef |
| children | 86fe6e2fa5ae |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 22 Nov 2012 21:02:27 +0000 |
| parents | 0da4e0f0f0ef |
| children | 86fe6e2fa5ae |