comparison plugins/muc/lock.lib.lua @ 7723:488fddf88ffd

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 19 Nov 2016 01:05:36 +0100
parents cf53081ce767
children 980606856882
comparison
equal deleted inserted replaced
7719:17c7e3ac47f7 7723:488fddf88ffd