Mercurial > prosody-hg
diff tests/test_core_s2smanager.lua @ 2961:db3c0ecce3f4
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 03 Apr 2010 23:09:11 +0100 |
| parents | b7049746bd29 |
| children | 6df0ec991f2e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 03 Apr 2010 23:09:11 +0100 |
| parents | b7049746bd29 |
| children | 6df0ec991f2e |