Mercurial > prosody-hg
diff core/s2smanager.lua @ 2968:fdd049a4e551
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 09 Apr 2010 12:31:51 +0100 |
| parents | 294c359a05f5 |
| children | aaaea4cdbf10 6eca858feb04 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 09 Apr 2010 12:31:51 +0100 |
| parents | 294c359a05f5 |
| children | aaaea4cdbf10 6eca858feb04 |