Software / code / prosody
Diff
util/xmppstream.lua @ 6313:8bd486b6e5ec
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:02:46 +0100 |
| parent | 6084:3c02a9ed399e |
| child | 6355:c2d144d3f8dd |
/ code / prosody | author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:02:46 +0100 |
| parent | 6084:3c02a9ed399e |
| child | 6355:c2d144d3f8dd |