Mercurial > prosody-hg
diff util/xmppstream.lua @ 4279:9808e2b32aa5
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 00:05:33 +0100 |
| parents | 7cc426988bcc 67ce42aa7419 |
| children | ffaaa3fd3189 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 00:05:33 +0100 |
| parents | 7cc426988bcc 67ce42aa7419 |
| children | ffaaa3fd3189 |