Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Mon, 26 Jan 2015 14:25:16 +0000 (15:25 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 26 Jan 2015 14:25:16 +0000 (15:25 +0100)
1  2 
core/stanza_router.lua

Simple merge