Comparison

plugins/muc/lock.lib.lua @ 6799:4fc6b0a090bb

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 26 Aug 2015 13:17:37 +0200
parent 6329:6b3eb1611587
child 7407:e465b584547b
comparison
equal deleted inserted replaced
6794:e3c51bf7861b 6799:4fc6b0a090bb