Comparison

plugins/muc/lock.lib.lua @ 7074:3ff83773ffc0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 10 Jan 2016 03:57:17 +0100
parent 6329:6b3eb1611587
child 7407:e465b584547b
comparison
equal deleted inserted replaced
7063:bc1b375f379e 7074:3ff83773ffc0