Mercurial > prosody-hg
comparison core/s2smanager.lua @ 5246:eba55873ef29
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 15 Dec 2012 05:35:43 +0100 |
| parents | 50688a2856f7 |
| children | 10bc0e2aa55e |
comparison
equal
deleted
inserted
replaced
| 5242:b86172b12912 | 5246:eba55873ef29 |
|---|
