Mercurial > prosody-hg
diff tests/test_core_s2smanager.lua @ 4956:bc26e6d519ae
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | b7049746bd29 |
| children | 6df0ec991f2e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | b7049746bd29 |
| children | 6df0ec991f2e |