Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Thu, 25 Jun 2015 16:54:01 +0000 (18:54 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 25 Jun 2015 16:54:01 +0000 (18:54 +0200)
commitf6b3f550857678d676b31c5338f4bc6a93df1339
tree2e4e3fde70e287cd06892531175ec47aff9cd43a
parenta4ec5ffdfaffab750e37aef206873ec3ecb97751
parent4342ca1bcea04e75da9d771e3cb6d6de1d144a90
Merge 0.9->0.10
plugins/muc/mod_muc.lua