Comparison

plugins/muc/lock.lib.lua @ 7123:a7ace4f32080

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 03 Feb 2016 23:02:36 +0100
parent 6329:6b3eb1611587
child 7407:e465b584547b
comparison
equal deleted inserted replaced
7121:bb1adaabcff6 7123:a7ace4f32080