Mercurial > prosody-hg
diff util/stanza.lua @ 138:cb0dd442ca63
Making the best attempt out of a bad merge from waqas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 23 Oct 2008 18:24:55 +0100 |
| parents | 6d66eb6b24cb |
| children | fbb3a4ff9cf1 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 23 Oct 2008 18:24:55 +0100 |
| parents | 6d66eb6b24cb |
| children | fbb3a4ff9cf1 |