Mercurial > prosody-hg
diff tests/test_core_s2smanager.lua @ 6442:0f4025abbe8f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Sep 2014 01:56:22 +0200 |
| parents | bd0ff8ae98a8 |
| children |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Sep 2014 01:56:22 +0200 |
| parents | bd0ff8ae98a8 |
| children |