Diff

plugins/muc/lock.lib.lua @ 7085:343be83ddfa6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 16 Jan 2016 22:44:43 +0100
parent 6329:6b3eb1611587
child 7407:e465b584547b
line wrap: on
line diff