Mercurial > prosody-hg
diff core/s2smanager.lua @ 3304:fec74b84df61
Merge backout
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 29 Jun 2010 20:23:11 +0100 |
| parents | 6eca858feb04 |
| children | c6091977624b 1c58cb93ef3e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 29 Jun 2010 20:23:11 +0100 |
| parents | 6eca858feb04 |
| children | c6091977624b 1c58cb93ef3e |