comparison plugins/muc/lock.lib.lua @ 7808:0494bf73dfee

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 04 Jan 2017 10:53:16 +0100
parents cf53081ce767
children 980606856882
comparison
equal deleted inserted replaced
7803:4d182b9a8109 7808:0494bf73dfee