Mercurial > prosody-hg
diff core/s2smanager.lua @ 5166:72cdc2d4e15e
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Oct 2012 20:15:39 +0100 |
| parents | 50688a2856f7 |
| children | 10bc0e2aa55e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Oct 2012 20:15:39 +0100 |
| parents | 50688a2856f7 |
| children | 10bc0e2aa55e |