Mercurial > prosody-hg
diff core/s2smanager.lua @ 5469:fcdcc37ffec1
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Apr 2013 00:45:46 +0100 |
| parents | 3a821511b9ec |
| children | bd0ff8ae98a8 c6c996410064 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 12 Apr 2013 00:45:46 +0100 |
| parents | 3a821511b9ec |
| children | bd0ff8ae98a8 c6c996410064 |