Mercurial > prosody-hg
diff core/s2smanager.lua @ 4200:fb487ee690ea
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 24 Feb 2011 02:04:56 +0000 |
| parents | e3282871dd44 1cad1c3495dd |
| children | fd4d1cf6d63e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 24 Feb 2011 02:04:56 +0000 |
| parents | e3282871dd44 1cad1c3495dd |
| children | fd4d1cf6d63e |