Software / code / prosody
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 |
| parent | 4156:e3282871dd44 |
| parent | 4187:1cad1c3495dd |
| child | 4262:fd4d1cf6d63e |
