Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Tue, 19 Apr 2016 15:30:30 +0000 (17:30 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 19 Apr 2016 15:30:30 +0000 (17:30 +0200)
commit0d17fe66e31e8c782c0b360e5bf4ad6069c69346
tree0d07cee56739547d7c0aa81b7f53297f360c4351
parent32fc1eab34fd3770bd0a9681fed564f9351797bc
parente584f68fbee601edfd46d0916cfd1494fcb96359
Merge 0.9->0.10
net/server_event.lua
plugins/muc/muc.lib.lua