comparison plugins/muc/lock.lib.lua @ 7085:343be83ddfa6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 16 Jan 2016 22:44:43 +0100
parents 6b3eb1611587
children e465b584547b
comparison
equal deleted inserted replaced
7075:47a2deb74b56 7085:343be83ddfa6