Mercurial > prosody-hg
comparison core/s2smanager.lua @ 5160:da7fe5de82fb
Merge 0.9 -> trunk (like this?)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | 50688a2856f7 |
| children | 10bc0e2aa55e |
comparison
equal
deleted
inserted
replaced
| 5159:0638ff1e1a5a | 5160:da7fe5de82fb |
|---|
