Mercurial > prosody-hg
diff core/s2smanager.lua @ 5578:b8101bc0630f
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 May 2013 09:39:32 +0100 |
| parents | 3a821511b9ec |
| children | bd0ff8ae98a8 c6c996410064 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 May 2013 09:39:32 +0100 |
| parents | 3a821511b9ec |
| children | bd0ff8ae98a8 c6c996410064 |