Mercurial > prosody-hg
diff core/s2smanager.lua @ 4283:ffaaa3fd3189
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 00:26:48 +0100 |
| parents | fd4d1cf6d63e |
| children | 332fc256c76e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 00:26:48 +0100 |
| parents | fd4d1cf6d63e |
| children | 332fc256c76e |