Mercurial > prosody-hg
diff util/xmppstream.lua @ 5495:d5b07342fccf
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2013 11:14:16 +0100 |
| parents | 86fe6e2fa5ae |
| children | bd0ff8ae98a8 1107d66d2ab2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2013 11:14:16 +0100 |
| parents | 86fe6e2fa5ae |
| children | bd0ff8ae98a8 1107d66d2ab2 |