Another automatic merge, this gets annoying."
[prosody.git] / tests / test_core_s2smanager.lua
2008-11-23 Tobias MarkmannMerging with main branch.
2008-11-20 Matthew WildOops, never added the tests for s2smanager to the repo