Software / code / prosody
Diff
util/xmppstream.lua @ 4278:67ce42aa7419
Merge 0.7->0.8
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 01 Jun 2011 23:26:39 +0100 |
| parent | 4277:683523db4fe8 |
| parent | 4275:5305a665bdd4 |
| child | 4279:9808e2b32aa5 |
| child | 4282:f5a46b73432b |
