comparison plugins/muc/muc.lib.lua @ 7868:11fcdef5022f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 26 Jan 2017 19:47:33 +0100
parents d92e186c2a1c
children 47cb54a08336
comparison
equal deleted inserted replaced
7861:58dbe5afeb4a 7868:11fcdef5022f