Comparison

plugins/muc/lock.lib.lua @ 7120:a6afe52159f1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 03 Feb 2016 02:13:03 +0100
parent 6329:6b3eb1611587
child 7407:e465b584547b
comparison
equal deleted inserted replaced
7119:50b9a7e86de9 7120:a6afe52159f1