Software / code / prosody
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 |
| parent | 2951:294c359a05f5 |
| child | 3146:aaaea4cdbf10 |
| child | 3151:6eca858feb04 |