Diff

plugins/muc/lock.lib.lua @ 6423:1c78f10f05d0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 23 Sep 2014 01:44:16 +0200
parent 6329:6b3eb1611587
child 7407:e465b584547b
line wrap: on
line diff