Mercurial > prosody-hg
diff util/stanza.lua @ 2968:fdd049a4e551
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 09 Apr 2010 12:31:51 +0100 |
| parents | db3c0ecce3f4 |
| children | 730876bbe4e6 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 09 Apr 2010 12:31:51 +0100 |
| parents | db3c0ecce3f4 |
| children | 730876bbe4e6 |