Mercurial > prosody-hg
diff tests/test_core_s2smanager.lua @ 4518:f2d695d2e31e
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 09 Mar 2012 18:46:19 +0000 |
| parents | b7049746bd29 |
| children | 6df0ec991f2e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 09 Mar 2012 18:46:19 +0000 |
| parents | b7049746bd29 |
| children | 6df0ec991f2e |