Mercurial > prosody-hg
diff core/stanza_router.lua @ 5160:da7fe5de82fb
Merge 0.9 -> trunk (like this?)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | d59c842fe38e |
| children | bd0ff8ae98a8 e3de64f7c44d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | d59c842fe38e |
| children | bd0ff8ae98a8 e3de64f7c44d |