comparison plugins/muc/lock.lib.lua @ 7179:bfa3b2ee384c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 22 Feb 2016 15:24:20 +0100
parents 6b3eb1611587
children e465b584547b
comparison
equal deleted inserted replaced
7171:91d36a37a9ff 7179:bfa3b2ee384c