Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 19 Apr 2016 15:44:11 +0000 (17:44 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 19 Apr 2016 15:44:11 +0000 (17:44 +0200)
commit0736485d68cfa0669aa2fb7d5596a498604c2cd1
tree8c0c376d40f6d960552f23ee2b7746fba2f7c823
parentde54243d55e396242c517ad80f2fb235d43f567e
parent1a28b0fdce75dc7e16565069f1e007d08bfe2f19
Merge 0.10->trunk
plugins/mod_bosh.lua