Software / code / prosody
Diff
util/xmppstream.lua @ 5356:97197ca60cb2
Merge...
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 20 Mar 2013 20:35:59 +0000 |
| parent | 5311:86fe6e2fa5ae |
| child | 5776:bd0ff8ae98a8 |
| child | 6042:1107d66d2ab2 |
