Mercurial > prosody-hg
diff core/s2smanager.lua @ 2953:3cafa20e22e9
Merge 0.7/waqas->0.7/MattJ
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 30 Mar 2010 19:46:53 +0100 |
| parents | 294c359a05f5 |
| children | aaaea4cdbf10 6eca858feb04 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 30 Mar 2010 19:46:53 +0100 |
| parents | 294c359a05f5 |
| children | aaaea4cdbf10 6eca858feb04 |