Mercurial > prosody-hg
diff core/s2smanager.lua @ 2914:9f6fec37d3e2
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 22 Mar 2010 14:38:01 +0000 |
| parents | 9f214431de29 |
| children | f47bd0f7e2e6 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 22 Mar 2010 14:38:01 +0000 |
| parents | 9f214431de29 |
| children | f47bd0f7e2e6 |