Mercurial > prosody-hg
diff core/s2smanager.lua @ 5206:b4de85209ccf
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 29 Nov 2012 07:17:31 +0500 |
| parents | 50688a2856f7 |
| children | 10bc0e2aa55e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 29 Nov 2012 07:17:31 +0500 |
| parents | 50688a2856f7 |
| children | 10bc0e2aa55e |