Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 19 Apr 2016 15:10:42 +0000 (17:10 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 19 Apr 2016 15:10:42 +0000 (17:10 +0200)
commit05120c2431c0341a1d8426d5305206cd40f51815
tree01dee31e66ff0cb5cf0954df90aee9bbaded4b0d
parent61a5ee4e56f2c734e98f8ae30693cd3b60731f3c
parent32fc1eab34fd3770bd0a9681fed564f9351797bc
Merge 0.10->trunk
plugins/mod_bosh.lua