Comparison

plugins/muc/lock.lib.lua @ 6525:7c273da3cff6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Nov 2014 15:01:47 +0100
parent 6329:6b3eb1611587
child 7407:e465b584547b
comparison
equal deleted inserted replaced
6516:ecd8d6437053 6525:7c273da3cff6