Mercurial > prosody-hg
comparison core/s2smanager.lua @ 5444:30ab4e69a50d
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 08 Apr 2013 15:05:16 +0100 |
| parents | 56db8f2c8563 |
| children | 92b88476873a |
comparison
equal
deleted
inserted
replaced
| 5442:e66973c81e89 | 5444:30ab4e69a50d |
|---|
