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)
commit38e539bc0be80a3b6a784e06c9b33e347f9524fa
tree43dd455219a12da9c6b8fbed3b504485d5d09c8c
parentbef34b738b6ac867a989dc3b9094538cd7558e47
parentfb93d1b2bf91d5e957c9e72e851ae9ef5dac14aa
Merge 0.9->0.10
core/stanza_router.lua