Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Tue, 9 Sep 2014 12:42:33 +0000 (14:42 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 9 Sep 2014 12:42:33 +0000 (14:42 +0200)
1  2 
core/stanza_router.lua

Simple merge